From 6e99caaa729bed71360eb0d2a1e910000767a4c0 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 15 Jun 2010 11:38:58 +0000
Subject: [PATCH] LMS-1522 NPE fixed
SVN: 16514
---
.../cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java
index f39df57c12d..478c06adb4a 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dataaccess/HCSDatasetLoader.java
@@ -141,9 +141,12 @@ public class HCSDatasetLoader implements IHCSDatasetLoader
imageDTO =
query.tryGetImage(chosenChannelId, getDataset().getId(), tileLocation,
wellLocation);
- content =
+ if (imageDTO != null)
+ {
+ content =
new ThumbnailContent(contentRepository.getContent(imageDTO.getFilePath()),
thumbnailSizeOrNull);
+ }
} else
{
content = contentRepository.getContent(imageDTO.getFilePath());
--
GitLab