From e7a2c2edd4de239b8eef6637932cb6c9945429fe Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 22 Mar 2022 14:42:21 +0100 Subject: [PATCH] Added check on null eMail, fullName or jobTitle to support clientID --- src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java index 0254509..88f9ddd 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java @@ -88,7 +88,7 @@ public class CKANUser extends CKAN { if(objectNode.has(ABOUT)) { ckanJobTitle = objectNode.get(ABOUT).asText(); } - if(jobTitle.compareTo(ckanJobTitle) != 0) { + if(jobTitle!=null && jobTitle.compareTo(ckanJobTitle) != 0) { objectNode.put(ABOUT, jobTitle); return true; } @@ -107,7 +107,7 @@ public class CKANUser extends CKAN { if(objectNode.has(FULL_NAME)) { ckanFullname = objectNode.get(FULL_NAME).asText(); } - if(portalFullname.compareTo(ckanFullname) != 0) { + if(portalFullname!=null && portalFullname.compareTo(ckanFullname) != 0) { objectNode.put(FULL_NAME, portalFullname); objectNode.put(DISPLAY_NAME, portalFullname); return true; @@ -127,7 +127,7 @@ public class CKANUser extends CKAN { if(objectNode.has(EMAIL)) { ckanEmail = objectNode.get(EMAIL).asText(); } - if(portalEmail.compareTo(ckanEmail) != 0) { + if(portalEmail!= null && portalEmail.compareTo(ckanEmail) != 0) { objectNode.put(EMAIL, portalEmail); return true; }