[SDKS-7608] Fix null pointer when a feature flag has a set that is no…

…t in the storage
splitio · Oct 20, 2023 · e57d00f · e57d00f
1 parent 0a5605c
commit e57d00f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/client/src/main/java/io/split/storages/memory/InMemoryCacheImp.java b/client/src/main/java/io/split/storages/memory/InMemoryCacheImp.java
@@ -206,8 +206,10 @@ private void removeFromFlagSets(String featureFlagName, HashSet<String> sets) {
         if (sets != null) {
             for (String set : sets) {
                 HashSet<String> features = _flagSets.get(set);
-                features.remove(featureFlagName);
-                _flagSets.put(set, features);
+                if (features != null) {
+                    features.remove(featureFlagName);
+                    _flagSets.put(set, features);
+                }
             }
         }
     }

diff --git a/client/src/test/java/io/split/storages/memory/InMemoryCacheTest.java b/client/src/test/java/io/split/storages/memory/InMemoryCacheTest.java
@@ -151,7 +151,7 @@ public void testSegmentNames() {
     }
 
     private ParsedSplit getParsedSplit(String splitName) {
-        return ParsedSplit.createParsedSplitForTests(splitName, 0, false, "default_treatment", new ArrayList<>(), "tt", 123, 2, new HashSet<>());
+        return ParsedSplit.createParsedSplitForTests(splitName, 0, false, "default_treatment", new ArrayList<>(), "tt", 123, 2, new HashSet<>(Arrays.asList("set1", "set2", "set3")));
     }
 
     @Test
-Original file line number
+Diff line change
@@ Expand Up / @@ -151,7 +151,7 @@ public void testSegmentNames() { @@
         }
         private ParsedSplit getParsedSplit(String splitName) {
-            return ParsedSplit.createParsedSplitForTests(splitName, 0, false, "default_treatment", new ArrayList<>(), "tt", 123, 2, new HashSet<>());
+            return ParsedSplit.createParsedSplitForTests(splitName, 0, false, "default_treatment", new ArrayList<>(), "tt", 123, 2, new HashSet<>(Arrays.asList("set1", "set2", "set3")));
         }
         @Test
@@ Expand Down @@