From 93809c4f8ad7f420e46b08681251c50c7adff965 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 8 Jun 2011 11:21:33 +0000
Subject: [PATCH] [LMS-2264] add NULL handling for Connections
SVN: 21646
---
.../generic/server/api/v1/GeneralInformationService.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
index a39fba11eb7..665b59e2ce6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
@@ -382,9 +382,12 @@ public class GeneralInformationService extends AbstractServer<IGeneralInformatio
}
public List<DataSet> listDataSets(String sessionToken, List<Sample> samples,
- EnumSet<Connections> connectionsToGet)
+ EnumSet<Connections> connections)
{
checkSession(sessionToken);
+ EnumSet<Connections> connectionsToGet =
+ (connections != null) ? connections : EnumSet.noneOf(Connections.class);
+
List<ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType> sampleTypes =
commonServer.listSampleTypes(sessionToken);
SampleToDataSetRelatedEntitiesTranslator translator =
--
GitLab