Skip to content

Commit 0a948f5

Browse files
committed
Merge branch 'owls-122929' into 'release/4.2'
fix npe See merge request weblogic-cloud/weblogic-kubernetes-operator!4851
2 parents cf348a6 + abf0732 commit 0a948f5

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import oracle.kubernetes.operator.helpers.PodDisruptionBudgetHelper;
3232
import oracle.kubernetes.operator.helpers.PodHelper;
3333
import oracle.kubernetes.operator.helpers.ServiceHelper;
34+
import oracle.kubernetes.operator.work.FiberGate;
3435
import oracle.kubernetes.operator.work.Packet;
3536
import oracle.kubernetes.weblogic.domain.model.ClusterList;
3637
import oracle.kubernetes.weblogic.domain.model.ClusterResource;
@@ -220,7 +221,12 @@ private void updateDeletedDomainsInDPI(DomainList list) {
220221
}
221222

222223
private boolean isNotBeingProcessed(String namespace, String domainUid) {
223-
return processor.getMakeRightFiberGateMap().get(namespace).getCurrentFibers().get(domainUid) == null;
224+
return Optional.ofNullable(processor)
225+
.map(DomainProcessor::getMakeRightFiberGateMap)
226+
.map(m -> m.get(namespace))
227+
.map(FiberGate::getCurrentFibers)
228+
.map(f -> f.get(domainUid))
229+
.isEmpty();
224230
}
225231

226232
private void addDomain(DomainResource domain) {

0 commit comments

Comments
 (0)