diff --git a/src/main/java/org/springframework/data/gemfire/tests/mock/MockGemFireObjectsSupport.java b/src/main/java/org/springframework/data/gemfire/tests/mock/MockGemFireObjectsSupport.java index 7d77426..7949186 100644 --- a/src/main/java/org/springframework/data/gemfire/tests/mock/MockGemFireObjectsSupport.java +++ b/src/main/java/org/springframework/data/gemfire/tests/mock/MockGemFireObjectsSupport.java @@ -1413,7 +1413,8 @@ public abstract class MockGemFireObjectsSupport extends MockObjectsSupport { data.get(invocation.getArgument(0))); when(mockRegion.getEntry(ArgumentMatchers.any())).thenAnswer(invocation -> - data.entrySet().stream().filter(entry -> entry.getKey().equals(invocation.getArgument(0))).findFirst()); + data.entrySet().stream().filter(entry -> entry.getKey().equals(invocation.getArgument(0))).findFirst() + .orElse(null)); when(mockRegion.put(any(), any())).thenAnswer(invocation -> data.put(invocation.getArgument(0), invocation.getArgument(1)));