Notify SessionActivityListeners using client executor (#1348)

This prevents deadlock when the user makes a blocking call that requires the Session from the SessionFsm. fixes #1300
eclipse-milo · Nov 29, 2024 · 5e413f5 · 5e413f5
1 parent 7b966e0
commit 5e413f5
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/...sdk-client/src/main/java/org/eclipse/milo/opcua/sdk/client/session/SessionFsmFactory.java b/...sdk-client/src/main/java/org/eclipse/milo/opcua/sdk/client/session/SessionFsmFactory.java
@@ -593,8 +593,11 @@ public void onStateTransition(
                 SessionFsm.SessionActivityListeners sessionActivityListeners =
                     KEY_SESSION_ACTIVITY_LISTENERS.get(ctx);
 
-                sessionActivityListeners.sessionActivityListeners
-                    .forEach(listener -> listener.onSessionActive(session));
+                client.getConfig().getExecutor().execute(
+                    () ->
+                        sessionActivityListeners.sessionActivityListeners
+                            .forEach(listener -> listener.onSessionActive(session))
+                );
             });
 
         // onSessionInactive() callbacks
@@ -607,8 +610,11 @@ public void onStateTransition(
                 SessionFsm.SessionActivityListeners sessionActivityListeners =
                     KEY_SESSION_ACTIVITY_LISTENERS.get(ctx);
 
-                sessionActivityListeners.sessionActivityListeners
-                    .forEach(listener -> listener.onSessionInactive(session));
+                client.getConfig().getExecutor().execute(
+                    () ->
+                        sessionActivityListeners.sessionActivityListeners
+                            .forEach(listener -> listener.onSessionInactive(session))
+                );
             });