From 1477868b67cd20ddbadca239a65eedf474135a2b Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Wed, 16 Jun 2010 11:58:42 +0000
Subject: [PATCH] LMS-1541 bugfix: reviewing panel
SVN: 16555
---
.../screening/server/logic/GenePlateLocationsLoader.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/GenePlateLocationsLoader.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/GenePlateLocationsLoader.java
index 297041c05f8..4b329d1e26f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/GenePlateLocationsLoader.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/GenePlateLocationsLoader.java
@@ -163,7 +163,12 @@ public class GenePlateLocationsLoader
List<ExternalDataPE> datasets = new ArrayList<ExternalDataPE>();
for (WellContent wellContent : wellContents)
{
- datasets.addAll(plateToDatasetMap.get(wellContent.getPlate().getId()));
+ List<ExternalDataPE> plateDatasets =
+ plateToDatasetMap.get(wellContent.getPlate().getId());
+ if (plateDatasets != null)
+ {
+ datasets.addAll(plateDatasets);
+ }
}
return datasets;
}
--
GitLab