Fixed the null pointer in unit tests

ORCID · Feb 11, 2025 · f3a403a · f3a403a
1 parent 189347f
commit f3a403a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...d-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/ror/RorOrgLoadSource.java b/...d-scheduler-web/src/main/java/org/orcid/scheduler/loader/source/ror/RorOrgLoadSource.java
@@ -211,11 +211,14 @@ private boolean loadData() {
                                 country = StringUtils.isBlank(countryCode) ? null : Iso3166Country.fromValue(countryCode);
                                 // for now storing just the first location
                                 city = geoDetailsNode.get("name").isNull() ? null : geoDetailsNode.get("name").asText();
-                                region = geoDetailsNode.get("country_subdivision_name").isNull() ? null : geoDetailsNode.get("country_subdivision_name").asText();
+                                if(geoDetailsNode.get("country_subdivision_name") != null ) {
+                                    region = geoDetailsNode.get("country_subdivision_name").isNull() ? null : geoDetailsNode.get("country_subdivision_name").asText();
+                                }
                                 if (country != null) {
                                     break;
                                 }
                             }
+
 
                         }
                         locationsJson = locationsNode.toString();
@@ -256,6 +259,7 @@ private OrgDisambiguatedEntity processInstitute(String sourceId, String name, Is
 
             String region, String url, String orgType, String locationsJson, String namesJson) {
         OrgDisambiguatedEntity existingBySourceId = orgDisambiguatedDao.findBySourceIdAndSourceType(sourceId, OrgDisambiguatedSourceType.ROR.name());
+
         if (existingBySourceId != null) {
             boolean entityChanged = entityChanged(existingBySourceId, name, country.value(), city, region, url, orgType, locationsJson, namesJson);
             if (entityChanged || indexAllEnabled) {