NPE check DefaultDescriptorService

gbif · Oct 23, 2024 · 2929a00 · 2929a00
1 parent f9ae3f3
commit 2929a00
Showing 1 changed file with 30 additions and 28 deletions.
diff --git a/...main/java/org/gbif/registry/service/collections/descriptors/DefaultDescriptorService.java b/...main/java/org/gbif/registry/service/collections/descriptors/DefaultDescriptorService.java
@@ -447,34 +447,36 @@ private DescriptorDto interpretDescriptor(Map<String, String> valuesMap) {
       descriptorDto.setUsageName(taxonomyResult.getResult().getUsageName());
       descriptorDto.setTaxonKeys(taxonomyResult.getResult().getTaxonKeys());
       descriptorDto.setTaxonClassification(taxonomyResult.getResult().getTaxonClassification());
-      taxonomyResult
-          .getResult()
-          .getTaxonClassification()
-          .forEach(
-              r -> {
-                if (r.getRank() == Rank.KINGDOM) {
-                  descriptorDto.setKingdomKey(r.getKey());
-                  descriptorDto.setKingdomName(r.getName());
-                } else if (r.getRank() == Rank.PHYLUM) {
-                  descriptorDto.setPhylumKey(r.getKey());
-                  descriptorDto.setPhylumName(r.getName());
-                } else if (r.getRank() == Rank.CLASS) {
-                  descriptorDto.setClassKey(r.getKey());
-                  descriptorDto.setClassName(r.getName());
-                } else if (r.getRank() == Rank.ORDER) {
-                  descriptorDto.setOrderKey(r.getKey());
-                  descriptorDto.setOrderName(r.getName());
-                } else if (r.getRank() == Rank.FAMILY) {
-                  descriptorDto.setFamilyKey(r.getKey());
-                  descriptorDto.setFamilyName(r.getName());
-                } else if (r.getRank() == Rank.GENUS) {
-                  descriptorDto.setGenusKey(r.getKey());
-                  descriptorDto.setGenusName(r.getName());
-                } else if (r.getRank() == Rank.SPECIES) {
-                  descriptorDto.setSpeciesKey(r.getKey());
-                  descriptorDto.setSpeciesName(r.getName());
-                }
-              });
+      if (taxonomyResult.getResult().getTaxonClassification() != null) {
+        taxonomyResult
+            .getResult()
+            .getTaxonClassification()
+            .forEach(
+                r -> {
+                  if (r.getRank() == Rank.KINGDOM) {
+                    descriptorDto.setKingdomKey(r.getKey());
+                    descriptorDto.setKingdomName(r.getName());
+                  } else if (r.getRank() == Rank.PHYLUM) {
+                    descriptorDto.setPhylumKey(r.getKey());
+                    descriptorDto.setPhylumName(r.getName());
+                  } else if (r.getRank() == Rank.CLASS) {
+                    descriptorDto.setClassKey(r.getKey());
+                    descriptorDto.setClassName(r.getName());
+                  } else if (r.getRank() == Rank.ORDER) {
+                    descriptorDto.setOrderKey(r.getKey());
+                    descriptorDto.setOrderName(r.getName());
+                  } else if (r.getRank() == Rank.FAMILY) {
+                    descriptorDto.setFamilyKey(r.getKey());
+                    descriptorDto.setFamilyName(r.getName());
+                  } else if (r.getRank() == Rank.GENUS) {
+                    descriptorDto.setGenusKey(r.getKey());
+                    descriptorDto.setGenusName(r.getName());
+                  } else if (r.getRank() == Rank.SPECIES) {
+                    descriptorDto.setSpeciesKey(r.getKey());
+                    descriptorDto.setSpeciesName(r.getName());
+                  }
+                });
+      }
     }
     addIssues(descriptorDto, taxonomyResult);