X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-common%2Forg%2Flttng%2Fust%2Fagent%2FLTTngAgent.java;h=6b4f0135de08e4f05ffd0fa8ab472f55d6ddd212;hb=6b4fc51ebf77552964eeebc13caa68f7fd9012cf;hp=c98301d738b8aa3a81f17ce240e687c88a047794;hpb=1e1110055efac3a1713fe0c7b5f36d5b98895d92;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java
index c98301d7..6b4f0135 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/LTTngAgent.java
@@ -52,10 +52,12 @@ public class LTTngAgent {
 	 * logging. This dispose function is non-static for backwards
 	 * compatibility purposes.
 	 */
-	public synchronized void dispose() {
-		if (instance != null) {
-			instance.disposeInstance();
-			instance = null;
+	public void dispose() {
+		synchronized (LTTngAgent.class) {
+			if (instance != null) {
+				instance.disposeInstance();
+				instance = null;
+			}
 		}
 		return;
 	}