gCubeSystem
/
gcat
15
0
Fork 0
Code Issues Pull Requests Releases 13 Wiki Activity

Added check on null eMail, fullName or jobTitle to support clientID

This commit is contained in:
Luca Frosini 2022-03-22 14:42:21 +01:00
parent cead201063
commit e7a2c2edd4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java
View File

@ -88,7 +88,7 @@ public class CKANUser extends CKAN {
if(objectNode.has(ABOUT)) { if(objectNode.has(ABOUT)) {
ckanJobTitle = objectNode.get(ABOUT).asText(); ckanJobTitle = objectNode.get(ABOUT).asText();
} }
if(jobTitle.compareTo(ckanJobTitle) != 0) { if(jobTitle!=null && jobTitle.compareTo(ckanJobTitle) != 0) {
objectNode.put(ABOUT, jobTitle); objectNode.put(ABOUT, jobTitle);
return true; return true;
} }
@ -107,7 +107,7 @@ public class CKANUser extends CKAN {
if(objectNode.has(FULL_NAME)) { if(objectNode.has(FULL_NAME)) {
ckanFullname = objectNode.get(FULL_NAME).asText(); 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(FULL_NAME, portalFullname);
objectNode.put(DISPLAY_NAME, portalFullname); objectNode.put(DISPLAY_NAME, portalFullname);
return true; return true;
@ -127,7 +127,7 @@ public class CKANUser extends CKAN {
if(objectNode.has(EMAIL)) { if(objectNode.has(EMAIL)) {
ckanEmail = objectNode.get(EMAIL).asText(); ckanEmail = objectNode.get(EMAIL).asText();
} }
if(portalEmail.compareTo(ckanEmail) != 0) { if(portalEmail!= null && portalEmail.compareTo(ckanEmail) != 0) {
objectNode.put(EMAIL, portalEmail); objectNode.put(EMAIL, portalEmail);
return true; return true;
} }