improve: primary to secondary index edge case for dynamic mapper changes

Signed-off-by: Attila Mészáros <csviri@gmail.com>
operator-framework · Feb 21, 2024 · 55a8723 · 55a8723
1 parent 69711cf
commit 55a8723
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...operatorsdk/operator/processing/event/source/informer/DefaultPrimaryToSecondaryIndex.java b/...operatorsdk/operator/processing/event/source/informer/DefaultPrimaryToSecondaryIndex.java
@@ -33,9 +33,13 @@ public synchronized void onDelete(R resource) {
     primaryResources.forEach(
         primaryResource -> {
           var secondaryResources = index.get(primaryResource);
-          secondaryResources.remove(ResourceID.fromResource(resource));
-          if (secondaryResources.isEmpty()) {
-            index.remove(primaryResource);
+          // this can be null in just very special cases, like when the secondaryToPrimaryMapper is
+          // changing dynamically
+          if (secondaryResources != null) {
+            secondaryResources.remove(ResourceID.fromResource(resource));
+            if (secondaryResources.isEmpty()) {
+              index.remove(primaryResource);
+            }
           }
         });
   }