add a missing null-check before loading model-level annotations from …

…JSON
colomoto · Oct 3, 2024 · d8fdd9a · d8fdd9a
1 parent cb94f25
commit d8fdd9a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/org/colomoto/biolqm/metadata/Annotator.java b/src/main/java/org/colomoto/biolqm/metadata/Annotator.java
@@ -366,9 +366,7 @@ public void readAnnotationsFromJSON(JSONObject json, Map<String, N> nodeMap) {
 //			metadataModel.importCollectionsMetadata(json.getJSONArray("collections"));
 //		}
 
-		JSONObject jmodel = json.optJSONObject("model");
-		this.onModel().addJSON(jmodel);
-
+		this.onModel().addJSON(json.optJSONObject("model"));
 		readNodesJSON(json.optJSONObject("nodes"), nodeMap);
 		readEdgesJSON(json.optJSONObject("edges"), nodeMap);
 	}
@@ -424,6 +422,9 @@ private void readEdgesJSON(JSONObject jedges, Map<String, N> nodeMap) {
 	}
 
 	private void addJSON(JSONObject json) {
+		if (json ==null) {
+			return;
+		}
 		addJSONNotes(json.optJSONObject("notes"));
 		addJSONAnnotations(json.optJSONArray("annotation"));
 	}