Skip to content

Commit f7e28b8

Browse files
committed
wip
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 3d5f268 commit f7e28b8

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCache.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,22 @@ public synchronized Optional<ResourceEvent> doneEventFilterModify(
8585
return Optional.empty();
8686
}
8787
var ed = activeUpdates.get(resourceID);
88-
if (ed.decreaseActiveUpdates(updatedResourceVersion)) {
89-
activeUpdates.remove(resourceID);
90-
var res = ed.getLatestEventAfterLastUpdateEvent();
88+
if (ed == null || !ed.decreaseActiveUpdates(updatedResourceVersion)) {
9189
log.debug(
92-
"Zero active updates for resource id: {}; event after update event: {}; updated resource"
93-
+ " version: {}",
94-
resourceID,
95-
res.isPresent(),
96-
updatedResourceVersion);
97-
return res;
98-
} else {
99-
log.debug("Active updates {} for resource id: {}", ed.getActiveUpdates(), resourceID);
90+
"Active updates {} for resource id: {}",
91+
ed != null ? ed.getActiveUpdates() : 0,
92+
resourceID);
10093
return Optional.empty();
10194
}
95+
activeUpdates.remove(resourceID);
96+
var res = ed.getLatestEventAfterLastUpdateEvent();
97+
log.debug(
98+
"Zero active updates for resource id: {}; event after update event: {}; updated resource"
99+
+ " version: {}",
100+
resourceID,
101+
res.isPresent(),
102+
updatedResourceVersion);
103+
return res;
102104
}
103105

104106
public void onDeleteEvent(T resource, boolean unknownState) {

0 commit comments

Comments
 (0)