make fix mipmap url client a little more resilient

saalfeldlab · Mar 17, 2017 · a3fcc64 · a3fcc64
1 parent 2b69aae
commit a3fcc64
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/render-ws-spark-client/src/main/java/org/janelia/render/client/spark/FixMipmapUrlClient.java b/render-ws-spark-client/src/main/java/org/janelia/render/client/spark/FixMipmapUrlClient.java
@@ -37,6 +37,7 @@ public class FixMipmapUrlClient
 
     private enum UrlType { IMAGE, MASK, BOTH }
 
+    @SuppressWarnings("unused")
     private static class Parameters extends RenderDataClientParameters {
 
         // NOTE: --baseDataUrl, --owner, and --project parameters defined in RenderDataClientParameters
@@ -231,17 +232,21 @@ public Integer call(final Double z)
 
                                 if (fixImage) {
                                     imageUrl = imageAndMask.getImageUrl();
-                                    for (final Pattern p : replacementData.keySet()){
-                                        imageUrl = fixUrl(p, imageUrl, replacementData.get(p));
+                                    if ((imageUrl != null) && (imageUrl.length() > 0)) {
+                                        for (final Pattern p : replacementData.keySet()) {
+                                            imageUrl = fixUrl(p, imageUrl, replacementData.get(p));
+                                        }
                                     }
                                 } else {
                                     imageUrl = imageAndMask.getImageUrl();
                                 }
 
                                 if (fixMask) {
                                     maskUrl = imageAndMask.getMaskUrl();
-                                    for (final Pattern p : replacementData.keySet()) {
-                                        maskUrl = fixUrl(p, maskUrl, replacementData.get(p));
+                                    if ((maskUrl != null) && (maskUrl.length() > 0)) {
+                                        for (final Pattern p : replacementData.keySet()) {
+                                            maskUrl = fixUrl(p, maskUrl, replacementData.get(p));
+                                        }
                                     }
                                 } else {
                                     maskUrl = imageAndMask.getMaskUrl();
@@ -250,9 +255,9 @@ public Integer call(final Double z)
                                 fixedImageAndMask = new ImageAndMask(imageUrl, maskUrl);
                                 fixedImageAndMask.validate();
 
-                                final boolean imagePathChanged = fixImage &&
+                                final boolean imagePathChanged = fixImage && (imageUrl != null) &&
                                                                  (! imageUrl.equals(imageAndMask.getImageUrl()));
-                                final boolean maskPathChanged = fixMask &&
+                                final boolean maskPathChanged = fixMask && (maskUrl != null) &&
                                                                 (! maskUrl.equals(imageAndMask.getMaskUrl()));
                                 if (imagePathChanged || maskPathChanged) {
                                     fixedAtLeastOneSpec = true;