X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-jul%2Forg%2Flttng%2Fust%2Fjul%2FLTTngTCPSessiondClient.java;h=5fdb04986c6c6f8ab2b6147ad83c43f1adddd12d;hb=87d64abb45c7e1a47606b60570a8768489b51d96;hp=f3ac80dc6e78860ae8ae4fb72cfb182da65a445d;hpb=d099b3340db2a8cad810a2c096592df6d2bed75e;p=lttng-ust.git

diff --git a/liblttng-ust-jul/org/lttng/ust/jul/LTTngTCPSessiondClient.java b/liblttng-ust-jul/org/lttng/ust/jul/LTTngTCPSessiondClient.java
index f3ac80dc..5fdb0498 100644
--- 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 {
 
 				/*