Change client listener to receive events even without oldValue

infinispan · Oct 5, 2023 · b38e242 · b38e242
1 parent f72def4
commit b38e242
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/ClientEventsTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/ClientEventsTest.java
@@ -53,7 +53,7 @@ public void testRemovedEvent() {
       withClientListener(l, remote -> {
          l.expectNoEvents();
          remote.remove(1);
-         l.expectNoEvents();
+         l.expectOnlyRemovedEvent(1);
          remote.put(1, "one");
          l.expectOnlyCreatedEvent(1);
          remote.remove(1);

diff --git a/server/hotrod/src/main/java/org/infinispan/server/hotrod/ClientListenerRegistry.java b/server/hotrod/src/main/java/org/infinispan/server/hotrod/ClientListenerRegistry.java
@@ -409,10 +409,8 @@ boolean isSendEvent(CacheEntryEvent<byte[], byte[]> event) {
             switch (event.getType()) {
                case CACHE_ENTRY_CREATED:
                case CACHE_ENTRY_MODIFIED:
-                  return !event.isPre();
                case CACHE_ENTRY_REMOVED:
-                  CacheEntryRemovedEvent removedEvent = (CacheEntryRemovedEvent) event;
-                  return !event.isPre() && removedEvent.getOldValue() != null;
+                  return !event.isPre();
                case CACHE_ENTRY_EXPIRED:
                   return true;
                default: