BUG 35028949 - [35023368->14.1.1.0.13] CQC clients deadlock between O… (

#21) * BUG 35028949 - [35023368->14.1.1.0.13] CQC clients deadlock between ObservableHashMap and ContinuousQueryCache.ensureSynchronized [git-p4: depot-paths = "//dev/release.net/coherence-net-v14.1.1.0/": change = 98226] * Update workflow to use Java 17 * Attempt to fix .net issue
oracle · Apr 14, 2023 · 48ae33a · 48ae33a
1 parent e4e4c46
commit 48ae33a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -61,11 +61,16 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
-    # Set up Java 11
-    - name: Set up Java 11
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '3.1.x'
+
+    # Set up Java 17
+    - name: Set up Java 17
       uses: actions/setup-java@v1
       with:
-        java-version: '11'
+        java-version: '17'
 
     # Install SSL certificates
     - name: Install SSL certificates

diff --git a/src/Coherence.Core/Net/Cache/ContinuousQueryCache.cs b/src/Coherence.Core/Net/Cache/ContinuousQueryCache.cs
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2023, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
- * http://oss.oracle.com/licenses/upl.
+ * https://oss.oracle.com/licenses/upl.
  */
 using System;
 using System.Collections;
@@ -2557,11 +2557,18 @@ protected bool IsEventDeferred(object key)
             {
                 if (State <= CacheState.Configuring)
                 {
-                    // since the listeners are being configured and the local
-                    // cache is being populated, assume that the event is
-                    // being processed out-of-order and requires a subsequent
-                    // synchronization of the corresponding value
-                    cacheSyncReq[key] = null;
+                    if (typeof(DeactivationListener).Name.Equals(key))
+                    {
+                        cacheSyncReq.Clear();
+                    }
+                    else
+                    {
+                        // since the listeners are being configured and the local
+                        // cache is being populated, assume that the event is
+                        // being processed out-of-order and requires a subsequent
+                        // synchronization of the corresponding value
+                        cacheSyncReq[key] = null;
+                    }
                     isDeferred = true;
                 }
                 else
@@ -3056,13 +3063,16 @@ public override void EntryUpdated(CacheEventArgs evt)
                 // "truncate" event
                 ContinuousQueryCache queryCache    = m_parentQueryCache;
                 IObservableCache     internalCache = queryCache.InternalCache;
-                if (internalCache is LocalCache)
+                if (!queryCache.IsEventDeferred(typeof(DeactivationListener).Name))
                 {
-                    ((LocalCache) internalCache).Truncate();
-                }
-                else
-                {
-                    internalCache.Clear();
+                    if (internalCache is LocalCache)
+                    {
+                        ((LocalCache) internalCache).Truncate();
+                    }
+                    else
+                    {
+                        internalCache.Clear();
+                    }
                 }
             }