From f9137ffff9b1d4ad14ae97d3b3a313c753c9bdd4 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Tue, 16 May 2023 16:43:56 +0200
Subject: [PATCH] Fixed UUID Utility

---
 .../java/org/gcube/informationsystem/utils/UUIDUtility.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/gcube/informationsystem/utils/UUIDUtility.java b/src/main/java/org/gcube/informationsystem/utils/UUIDUtility.java
index 2ae4a79..574b2e9 100644
--- a/src/main/java/org/gcube/informationsystem/utils/UUIDUtility.java
+++ b/src/main/java/org/gcube/informationsystem/utils/UUIDUtility.java
@@ -18,7 +18,10 @@ public class UUIDUtility {
 	
 	public static UUID getUUID(JsonNode jsonNode){
 		if(jsonNode.has(IdentifiableElement.ID_PROPERTY)) {
-			return UUID.fromString(jsonNode.get(IdentifiableElement.ID_PROPERTY).asText());
+			JsonNode jsonNodeID = jsonNode.get(IdentifiableElement.ID_PROPERTY);
+			if(jsonNodeID!=null && jsonNodeID.isTextual()) {
+				return UUID.fromString(jsonNodeID.asText());
+			}
 		}
 		return null;
 	}