fixed problem with null annotations on swc export

JaneliaSciComp · Jan 30, 2024 · a5ba028 · a5ba028
1 parent 76a4d46
commit a5ba028
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...ViewerController/src/main/java/org/janelia/workstation/controller/tools/NoteExporter.java b/...ViewerController/src/main/java/org/janelia/workstation/controller/tools/NoteExporter.java
@@ -84,6 +84,11 @@ public static void exportNotes(String swcPath, Long workspaceID, double[] offset
                 ArrayNode notesNode = mapper.createArrayNode();
                 for (Long annID: neuron.getStructuredTextAnnotationMap().keySet()) {
                     TmGeoAnnotation ann = neuron.getGeoAnnotationMap().get(annID);
+                    if (ann == null) {
+                        // occasionally an annotation doesn't get deleted when its annotation does;
+                        //  ignore them
+                        continue;
+                    }
                     TmStructuredTextAnnotation textAnnotation = neuron.getStructuredTextAnnotationMap().get(annID);
                     JsonNode jsonNode = textAnnotation.getData().path("note");
                     if (!jsonNode.isMissingNode()) {