Merge pull request #4234 from sbesson/cv7000_close_npe

CV7000: handle NullPointerException when resetting allFiles in close()
ome · Sep 16, 2024 · 686371d · 686371d
2 parents 2314528 + 9e3c38b
commit 686371d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/components/formats-gpl/src/loci/formats/in/CV7000Reader.java b/components/formats-gpl/src/loci/formats/in/CV7000Reader.java
@@ -223,7 +223,11 @@ public void close(boolean fileOnly) throws IOException {
       reversePlaneLookup = null;
       extraFiles = null;
       acquiredWells.clear();
-      allFiles.clear();
+      if (allFiles != null) {
+          allFiles.clear();
+      } else {
+          allFiles = new ArrayList<String>();
+      }
     }
   }