X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-common%2Forg%2Flttng%2Fust%2Fagent%2FLTTngAgent.java;h=f6aae3513ac42acae5834fd833ea1fe3552b0038;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=1a6b59a622cf2b6797fdb2e53bb714be6946961b;hpb=01a00a70d0b9f325bee6e85d685d32054e73c768;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 1a6b59a6..f6aae351 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
@@ -1,18 +1,7 @@
 /*
- * Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
  */
 
 package org.lttng.ust.agent;
@@ -49,12 +38,16 @@ public class LTTngAgent {
 
 	/**
 	 * Dispose the agent. Applications should call this once they are done
-	 * logging.
+	 * logging. This dispose function is non-static for backwards
+	 * compatibility purposes.
 	 */
-	public static synchronized void dispose() {
-		if (instance != null) {
-			instance.disposeInstance();
-			instance = null;
+	@SuppressWarnings("static-method")
+	public void dispose() {
+		synchronized (LTTngAgent.class) {
+			if (instance != null) {
+				instance.disposeInstance();
+				instance = null;
+			}
 		}
 		return;
 	}