From 170bda4c69028f92a15ec839fa14cb643cb82753 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Tue, 3 Sep 2013 08:38:33 +0000
Subject: [PATCH] SP-860 BIS-526 Improve error message when convert utility not
found
SVN: 29700
---
.../cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java
index 5d37815c3f6..00496f14c10 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/Hdf5ThumbnailGenerator.java
@@ -37,6 +37,7 @@ import ch.systemsx.cisd.common.concurrent.ConcurrencyUtilities;
import ch.systemsx.cisd.common.concurrent.FailureRecord;
import ch.systemsx.cisd.common.concurrent.ITaskExecutor;
import ch.systemsx.cisd.common.concurrent.ParallelizedExecutor;
+import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.logging.LogCategory;
@@ -363,6 +364,12 @@ public class Hdf5ThumbnailGenerator implements IHDF5WriterClient
}
List<String> params = new ArrayList<String>();
+
+ if (convertUtilityOrNull == null)
+ {
+ throw new EnvironmentFailureException("Trying to generate thimbnails with ImageMagic, but 'convert' executable not found on the OS path.");
+ }
+
params.addAll(Arrays.asList(convertUtilityOrNull.getPath(), imageFilePath, "-scale", size));
List<String> additionalParams = thumbnailsStorageFormat.getImageMagicParams();
if (additionalParams != null)
--
GitLab