fix NPE when ClientTaskStatusSupport is null, log error instead

virtualcell · Oct 15, 2024 · 1a12db4 · 1a12db4
1 parent 2b091cf
commit 1a12db4
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/vcell-core/src/main/java/cbit/vcell/VirtualMicroscopy/BioformatsImageImpl.java b/vcell-core/src/main/java/cbit/vcell/VirtualMicroscopy/BioformatsImageImpl.java
@@ -175,21 +175,33 @@ public ImageSizeInfo getImageSizeInfoForceZ(String fileName, Integer forceZSize)
     @Override
     public ImageDataset readImageDataset(String imageID, ClientTaskStatusSupport status) throws Exception {
         var imageDataset = readImageDataset(imageID);
-        status.setProgress(100);
+        if (status != null){
+            status.setProgress(100);
+        }else{
+            logger.warn("ClientTaskStatusSupport var status is null");
+        }
         return imageDataset;
     }
 
     @Override
     public ImageDataset[] readImageDatasetChannels(String imageID, ClientTaskStatusSupport status, boolean bMergeChannels, Integer timeIndex, ISize resize) throws Exception {
         var imageDatasets = readImageDatasetChannels(imageID, bMergeChannels, timeIndex, resize);
-        status.setProgress(100);
+        if (status != null){
+            status.setProgress(100);
+        }else{
+            logger.warn("ClientTaskStatusSupport var status is null");
+        }
         return imageDatasets;
     }
 
     @Override
     public ImageDataset readImageDatasetFromMultiFiles(File[] files, ClientTaskStatusSupport status, boolean isTimeSeries, double timeInterval) throws Exception {
         var imageDataset = readImageDatasetFromMultiFiles(files, isTimeSeries, timeInterval);
-        status.setProgress(100);
+        if (status != null){
+            status.setProgress(100);
+        }else{
+            logger.warn("ClientTaskStatusSupport var status is null");
+        }
         return imageDataset;
     }