Fixed NPE in issue #181

keeps · Aug 3, 2023 · 310842e · 310842e
1 parent 6293eef
commit 310842e
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/...mmons_ip2/validator/component/structuralMapComponent/StructuralMapComponentValidator.java b/...mmons_ip2/validator/component/structuralMapComponent/StructuralMapComponentValidator.java
@@ -437,7 +437,7 @@ private ReporterDetails validateCSIP80(final MetsValidatorState metsValidatorSta
     } else {
       int numberOfCSIPstructMaps = 0;
       for (StructMapType struct : structMap) {
-        if (struct.getLABEL().equals("CSIP")) {
+        if (struct.getLABEL() != null && struct.getLABEL().equals("CSIP")) {
           numberOfCSIPstructMaps++;
         }
       }
@@ -670,9 +670,8 @@ private ReporterDetails validateCSIP88(final MetsValidatorState metsValidatorSta
     }
     if (isMetadata) {
       for (StructMapType struct : structMap) {
-        final DivType div = struct.getDiv();
-        if (div != null && div.getLABEL().equals("CSIP")) {
-          final List<DivType> divs = div.getDiv();
+        if (struct.getLABEL() != null && struct.getLABEL().equals("CSIP")) {
+          final List<DivType> divs = struct.getDiv().getDiv();
           int counter = 0;
           for (DivType d : divs) {
             if (d.getLABEL().equals("Metadata")) {
@@ -1621,9 +1620,8 @@ private ReporterDetails validateCSIP106(final MetsValidatorState metsValidatorSt
     final List<StructMapType> structMap = metsValidatorState.getMets().getStructMap();
     if (structMap != null) {
       for (StructMapType struct : structMap) {
-        final DivType firstDiv = struct.getDiv();
-        if (firstDiv != null && firstDiv.getLABEL().equals("CSIP")) {
-          final List<DivType> divs = firstDiv.getDiv();
+        if (struct.getLABEL() != null && struct.getLABEL().equals("CSIP")) {
+          final List<DivType> divs = struct.getDiv().getDiv();
           for (DivType div : divs) {
             final String id = div.getID();
             if (id == null) {