add null check when fetching emails

ORCID · Nov 5, 2024 · 62cd783 · 62cd783
1 parent 85cfb05
commit 62cd783
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ManageProfileController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ManageProfileController.java
@@ -535,12 +535,14 @@ public ModelAndView confirmDeactivateOrcidAccount(HttpServletRequest request, Ht
         }
         org.orcid.pojo.ajaxForm.Emails emails = org.orcid.pojo.ajaxForm.Emails.valueOf(v2Emails, emailDomains);
         // Old emails are missing the source name and id -- assign the user as the source
-        for (org.orcid.pojo.ajaxForm.Email email: emails.getEmails()) {
-            if (email.getSource() == null && email.getSourceName() == null) {
-                String orcid = getCurrentUserOrcid();
-                String displayName = getPersonDetails(orcid, true).getDisplayName();
-                email.setSource(orcid);
-                email.setSourceName(displayName);
+        if (emails.getEmails() != null) {
+            for (org.orcid.pojo.ajaxForm.Email email : emails.getEmails()) {
+                if (email.getSource() == null && email.getSourceName() == null) {
+                    String orcid = getCurrentUserOrcid();
+                    String displayName = getPersonDetails(orcid, true).getDisplayName();
+                    email.setSource(orcid);
+                    email.setSourceName(displayName);
+                }
             }
         }
         return emails;

diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicRecordController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicRecordController.java
@@ -205,12 +205,15 @@ PublicRecord getRecord(String orcid) {
 
         org.orcid.pojo.ajaxForm.Emails emails = org.orcid.pojo.ajaxForm.Emails.valueOf(filteredEmails, emailDomains);
         // Old emails are missing the source name and id -- assign the user as the source
-        for (org.orcid.pojo.ajaxForm.Email email: emails.getEmails()) {
-            if (email.getSource() == null && email.getSourceName() == null) {
-                email.setSource(orcid);
-                email.setSourceName(publicRecord.getDisplayName());
+        if (emails.getEmails() != null) {
+            for (org.orcid.pojo.ajaxForm.Email email: emails.getEmails()) {
+                if (email.getSource() == null && email.getSourceName() == null) {
+                    email.setSource(orcid);
+                    email.setSourceName(publicRecord.getDisplayName());
+                }
             }
         }
+
         publicRecord.setEmails(emails);
 
         // Fill external identifiers