Merge branch 'resolve-npe' into 'main'

Resolve NPE for upgraded Failed status condition that is missing a severity level See merge request weblogic-cloud/weblogic-kubernetes-operator!4502
oracle · Nov 15, 2023 · 31bdd1f · 31bdd1f
2 parents 9e99c00 + b1da0a1
commit 31bdd1f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainConditionType.java b/operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainConditionType.java
@@ -6,6 +6,7 @@
 import com.google.gson.annotations.SerializedName;
 import oracle.kubernetes.json.Obsoleteable;
 import oracle.kubernetes.operator.helpers.EventHelper;
+import org.apache.commons.lang3.ObjectUtils;
 
 import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_AVAILABLE;
 import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_COMPLETE;
@@ -21,7 +22,7 @@ public enum DomainConditionType implements Obsoleteable {
     @Override
     int compare(DomainCondition thisCondition, DomainCondition thatCondition) {
       if (compareUsingSeverities(thisCondition, thatCondition)) {
-        return thisCondition.getSeverity().compareTo(thatCondition.getSeverity());
+        return ObjectUtils.compare(thisCondition.getSeverity(), thatCondition.getSeverity());
       } else {
         return super.compare(thisCondition, thatCondition);
       }