improved context handling

cip4 · Dec 23, 2022 · 8bbc236 · 8bbc236
1 parent 8700f16
commit 8bbc236
Show file tree

Hide file tree

Showing 3 changed files with 14,432 additions and 6 deletions.
diff --git a/src/main/java/org/cip4/lib/jdf/jsonutil/JSONReader.java b/src/main/java/org/cip4/lib/jdf/jsonutil/JSONReader.java
@@ -113,19 +113,28 @@ String getKey(final String key, Object object, KElement root)
 		String prefix = KElement.xmlnsPrefix(key);
 		if (prefix != null)
 		{
-			String namespaceURIFromPrefix = root.getNamespaceURIFromPrefix(prefix);
-			if (namespaceURIFromPrefix == null)
+			if (root != null)
 			{
-				if (object instanceof JSONObject)
+				String namespaceURIFromPrefix = root.getNamespaceURIFromPrefix(prefix);
+				if (namespaceURIFromPrefix == null)
 				{
-					processContext(((JSONObject) object).get("@context"), root);
+					if (object instanceof JSONObject)
+					{
+						Object context = ((JSONObject) object).get("@context");
+						if (context != null)
+						{
+							processContext(context, root);
+							return key;
+						}
+					}
 				}
 				else
 				{
-					log.warn("Missing context for prefix: " + key);
-					return KElement.xmlnsLocalName(key);
+					return key;
 				}
 			}
+			log.warn("Missing context for prefix: " + key);
+			return KElement.xmlnsLocalName(key);
 		}
 		return key;
 	}