Skip to content

Commit 383c92a

Browse files
committed
Correct check for condition severity
1 parent dcc2d0a commit 383c92a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

operator/src/main/java/oracle/kubernetes/operator/DomainStatusUpdater.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ private void addFailureCondition(DomainStatus status, DomainCondition condition)
581581
}
582582

583583
private boolean hasReachedRetryLimit(DomainStatus status, DomainCondition condition) {
584-
return condition.getSeverity() == SEVERE
584+
return (condition.getSeverity() == null || condition.getSeverity() == SEVERE)
585585
&& status.getInitialFailureTime() != null
586586
&& status.getMinutesFromInitialToLastFailure() >= getDomain().getFailureRetryLimitMinutes();
587587
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public boolean hasType(DomainConditionType type) {
243243
}
244244

245245
public boolean isRetriableFailure() {
246-
return getType() == FAILED && getSeverity() == SEVERE;
246+
return getType() == FAILED && (getSeverity() == null || getSeverity() == SEVERE);
247247
}
248248

249249
boolean isMarkedForDeletion() {

0 commit comments

Comments
 (0)