From 6d080e476ff9ba7373a0bf8f1956f943d3596c32 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 6 Jul 2011 08:00:27 +0000
Subject: [PATCH] minor: checking for NULLs returned from
SimpleImageDataConfig.extractMetadata
SVN: 22005
---
.../openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java | 6 ++++--
.../dss/etl/jython/SimpleImageDataSetRegistrator.java | 6 ++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java
index f77457cafb5..9a58eb515ad 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/SimpleImageDataConfig.java
@@ -59,8 +59,10 @@ abstract public class SimpleImageDataConfig
public ImageMetadata[] extractImagesMetadata(String imagePath,
List<ImageIdentifier> imageIdentifiers)
{
- return new ImageMetadata[]
- { extractImageMetadata(imagePath) };
+
+ ImageMetadata imageMetadata = extractImageMetadata(imagePath);
+ return (imageMetadata != null) ? new ImageMetadata[]
+ { imageMetadata } : new ImageMetadata[0];
}
// --- methods which can be overridden -----------------
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/SimpleImageDataSetRegistrator.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/SimpleImageDataSetRegistrator.java
index d7317e792d3..b7a5cbb1b2b 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/SimpleImageDataSetRegistrator.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/jython/SimpleImageDataSetRegistrator.java
@@ -179,10 +179,8 @@ public class SimpleImageDataSetRegistrator
simpleImageConfig.extractImagesMetadata(imageRelativePath, identifiers);
for (ImageMetadata imageToken : imageTokens)
{
- if (imageToken != null) {
- imageToken.ensureValid(simpleImageConfig.isMicroscopyData());
- imageTokensList.add(new ImageTokensWithPath(imageToken, imageRelativePath));
- }
+ imageToken.ensureValid(simpleImageConfig.isMicroscopyData());
+ imageTokensList.add(new ImageTokensWithPath(imageToken, imageRelativePath));
}
}
if (imageTokensList.size() == 0)
--
GitLab