From 1a12db437c6e9a105856f3b613c157e9a7e5ab71 Mon Sep 17 00:00:00 2001 From: jcschaff Date: Tue, 15 Oct 2024 14:38:09 -0400 Subject: [PATCH] fix NPE when ClientTaskStatusSupport is null, log error instead --- .../VirtualMicroscopy/BioformatsImageImpl.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 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 index 6e0b0a0236..0f20ccd2d1 100644 --- 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; }