From a6840461113392abdc9b9baa733486c89da497d0 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Thu, 25 Apr 2013 08:47:30 +0000
Subject: [PATCH] BIS-399 SP-608 : Fix an NPE in the login method of the
screening matlab API
SVN: 28905
---
screening/source/java/OpenBISScreeningML.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/screening/source/java/OpenBISScreeningML.java b/screening/source/java/OpenBISScreeningML.java
index f59c5485c66..e46f5f31b5f 100644
--- a/screening/source/java/OpenBISScreeningML.java
+++ b/screening/source/java/OpenBISScreeningML.java
@@ -39,6 +39,8 @@ import ch.systemsx.cisd.openbis.dss.client.api.v1.DataSet;
import ch.systemsx.cisd.openbis.dss.client.api.v1.IDataSetDss;
import ch.systemsx.cisd.openbis.dss.client.api.v1.IOpenbisServiceFacade;
import ch.systemsx.cisd.openbis.dss.client.api.v1.IOpenbisServiceFacadeFactory;
+import ch.systemsx.cisd.openbis.dss.client.api.v1.OpenbisServiceFacadeFactory;
+import ch.systemsx.cisd.openbis.dss.client.api.v1.impl.OpenbisServiceFacade;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.FileInfoDssDTO;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.NewDataSetMetadataDTO;
import ch.systemsx.cisd.openbis.generic.client.cli.Login;
@@ -289,6 +291,11 @@ public class OpenBISScreeningML
{
throw new RuntimeException("Login failed.");
}
+
+ if (null == genericFacadeFactory)
+ {
+ genericFacadeFactory = OpenbisServiceFacadeFactory.INSTANCE;
+ }
IOpenbisServiceFacade genericFacade =
genericFacadeFactory.tryToCreate(facade.getSessionToken(), url, 0);
init(facade, genericFacade);
--
GitLab