Bug 37507575 - [37506280->25.03] Hardened fail-over of gRPC APIs

(merge main -> ce/main 113707) [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 113708]
oracle · Jan 22, 2025 · 5b396e4 · 5b396e4
1 parent 2a08020
commit 5b396e4
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...n/src/main/java/com/oracle/coherence/grpc/proxy/common/cache/NamedCacheProxyProtocol.java b/...n/src/main/java/com/oracle/coherence/grpc/proxy/common/cache/NamedCacheProxyProtocol.java
@@ -48,8 +48,9 @@
 import com.tangosol.coherence.component.util.daemon.queueProcessor.service.Peer;
 
 import com.tangosol.coherence.component.util.daemon.queueProcessor.service.peer.Acceptor;
-import com.tangosol.coherence.component.util.daemon.queueProcessor.service.peer.acceptor.grpcAcceptor.GrpcChannel;
+
 import com.tangosol.internal.net.NamedCacheDeactivationListener;
+
 import com.tangosol.internal.util.collection.ConvertingNamedCache;
 import com.tangosol.internal.util.processor.BinaryProcessors;
 import com.tangosol.internal.util.processor.CacheProcessors;
@@ -128,7 +129,11 @@ public void close()
                 {
                 com.tangosol.net.messaging.Channel channel = proxy.getChannel();
                 proxy.unregisterChannel(channel);
-                proxy.removeMapListener(new CacheListener(proxy.getCacheId()));
+                NamedCache<?, ?> cache = proxy.getNamedCache();
+                if (cache != null && cache.isActive())
+                    {
+                    proxy.removeMapListener(new CacheListener(proxy.getCacheId()));
+                    }
                 }
             m_aProxy.clear();
             }