Fix: cleanup JUL agent state on sessiond disconnect

Signed-off-by: David Goulet <dgoulet@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java b/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java
index b4e1c088423a5a2e68f491b07ff9c24c528c97f7..ddeb5eb3b36e9e04cba608cbd0a17539a948c265 100644 (file)
--- a/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java
+++ b/liblttng-ust-jul/org/lttng/ust/jul/LTTngLogHandler.java
@@ -83,6 +83,14 @@ public class LTTngLogHandler extends Handler {
                }
        }
 
+       /*
+        * Cleanup this handler state meaning put it back to a vanilla state.
+        */
+       public void clear() {
+               this.eventMap.clear();
+               this.logLevelsAll.clear();
+       }
+
        @Override
        public void close() throws SecurityException {}
 

diff --git a/liblttng-ust-jul/org/lttng/ust/jul/LTTngTCPSessiondClient.java b/liblttng-ust-jul/org/lttng/ust/jul/LTTngTCPSessiondClient.java
index f3ac80dc6e78860ae8ae4fb72cfb182da65a445d..5fdb04986c6c6f8ab2b6147ad83c43f1adddd12d 100644 (file)
--- a/liblttng-ust-jul/org/lttng/ust/jul/LTTngTCPSessiondClient.java
+++ b/liblttng-ust-jul/org/lttng/ust/jul/LTTngTCPSessiondClient.java
@@ -186,6 +186,17 @@ public class LTTngTCPSessiondClient {
                }
        }
 
+       /*
+        * Cleanup Agent state.
+        */
+       private void cleanupState() {
+               enabledEventSet.clear();
+               enabledLoggers.clear();
+               if (this.handler != null) {
+                       this.handler.clear();
+               }
+       }
+
        public void init(LTTngLogHandler handler) throws InterruptedException {
                this.handler = handler;
 
@@ -194,6 +205,9 @@ public class LTTngTCPSessiondClient {
                                break;
                        }
 
+                       /* Cleanup Agent state before trying to connect or reconnect. */
+                       cleanupState();
+
                        try {
 
                                /*