Skip to content

Commit b2eb58f

Browse files
committed
Resolve NPE for upgraded Failed status condition that is missing a severity level
1 parent 8064604 commit b2eb58f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

operator/src/main/java/oracle/kubernetes/weblogic/domain/model/DomainConditionType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.google.gson.annotations.SerializedName;
77
import oracle.kubernetes.json.Obsoleteable;
88
import oracle.kubernetes.operator.helpers.EventHelper;
9+
import org.apache.commons.lang3.ObjectUtils;
910

1011
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_AVAILABLE;
1112
import static oracle.kubernetes.operator.helpers.EventHelper.EventItem.DOMAIN_COMPLETE;
@@ -21,7 +22,7 @@ public enum DomainConditionType implements Obsoleteable {
2122
@Override
2223
int compare(DomainCondition thisCondition, DomainCondition thatCondition) {
2324
if (compareUsingSeverities(thisCondition, thatCondition)) {
24-
return thisCondition.getSeverity().compareTo(thatCondition.getSeverity());
25+
return ObjectUtils.compare(thisCondition.getSeverity(), thatCondition.getSeverity());
2526
} else {
2627
return super.compare(thisCondition, thatCondition);
2728
}

0 commit comments

Comments
 (0)