Bug 36409014 - Build: Intermittent failure in queues.GrpcClientDequeTests.shouldGetNewInstanceOfDestroyedQueue

(merge main -> ce/main 107684)

[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 107725]

Author: thegridman

prj/coherence-grpc-proxy-common/src/main/java/com/oracle/coherence/grpc/proxy/common/BaseNamedCacheServiceImpl.java

@@ -224,8 +224,28 @@ public void destroy(DestroyRequest request, StreamObserver<Empty> observer)
         StreamObserver<Empty> safeObserver = SafeStreamObserver.ensureSafeObserver(observer);
         try
             {
-            NamedCache<Binary, Binary> cache = getPassThroughCache(request.getScope(), request.getCache());
-            cache.destroy();
+            String sCacheName = request.getCache();
+            if (sCacheName == null || sCacheName.trim().isEmpty())
+                {
+                throw Status.INVALID_ARGUMENT
+                        .withDescription(INVALID_CACHE_NAME_MESSAGE)
+                        .asRuntimeException();
+                }
+
+            ConfigurableCacheFactory   ccf           = getCCF(request.getScope());
+            NamedCache<Binary, Binary> cachePassThru = ccf.ensureCache(sCacheName, NullImplementation.getClassLoader());
+            NamedCache<Binary, Binary> cache         = ccf.ensureCache(sCacheName, Classes.getContextClassLoader());
+            // we get caches via the CCF, so we must destroy them that way too
+            ccf.destroyCache(cachePassThru);
+            try
+                {
+                ccf.destroyCache(cache);
+                }
+            catch (Exception ignored)
+                {
+                // We may get an exception if destroying the first pass-thru cache also destroys the plain cache.
+                // We can just ignore it.
+                }
             handleUnary(Empty.getDefaultInstance(), null, safeObserver);
             }
         catch (Throwable t)

prj/test/functional/grpc-proxy-netty/src/main/java/netty/grpc/proxy/NamedCacheServiceImplTest.java

@@ -758,8 +758,7 @@ public void shouldNotExecuteDestroyWithoutCacheName() throws Exception
     @Test
     public void shouldHandleDestroyError() throws Exception
         {
-        NamedCache cache = m_testAsyncCache.getNamedCache();
-        doThrow(ERROR).when(cache).destroy();
+        doThrow(ERROR).when(m_testCCF).destroyCache(any(NamedCache.class));
 
         TestStreamObserver<Empty>  observer = new TestStreamObserver<>();
         NamedCacheService service = s_serviceProvider.getService(m_dependencies);