Bug 37872354 - [37724206->22.06.13] NPE in Daemon.changeState() due to Daemon.getContext() unexpectedly NULL. (v14.1.1.2206->ce-2206)

Remote remote.full on coherence-ce/release/coherence-ce-v22.06 success, changes 115924, synced @115924, job.9.20250425152553.1169

[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v22.06/": change = 115943]

Author: jfialli

prj/coherence-core/src/main/java/com/tangosol/net/GuardSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -645,8 +645,11 @@ public int getState()
         public void release()
             {
             Guardable guardable = getGuardable();
-            guardable.setContext(null);
-            GuardSupport.this.remove(guardable);
+            if (guardable != null)
+                {
+                guardable.setContext(null);
+                GuardSupport.this.remove(guardable);
+                }
             }
 
         /**

prj/coherence-core/src/main/java/com/tangosol/util/Daemon.java

@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, 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.
  */
 
 package com.tangosol.util;
@@ -636,9 +636,10 @@ protected synchronized void changeState(int nState, DaemonWorker worker)
                     m_nState = STATE_STOPPED;
 
                     // release the GuardContext if this Daemon is being guarded
-                    if (isGuarded())
+                    Guardian.GuardContext ctx = getContext();
+                    if (ctx != null)
                         {
-                        getContext().release();
+                        ctx.release();
                         GuardSupport.setThreadContext(null);
                         }
                     }