From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 11 Apr 2016 22:57:42 +0000 (-0400)
Subject: Fix: lttng java agent: dispose is non-static
X-Git-Tag: v2.8.0-rc2~13
X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=commitdiff_plain;h=502d6e0f22a4f181d278371b63ce301953c6639a

Fix: lttng java agent: dispose is non-static

The UST 2.7 java agent LTTngAgent class has a non-static dispose method.
This class is kept in 2.8 for backwards compatibility purposes. Keep
this API unchanged.

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

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..c98301d7 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
@@ -49,9 +49,10 @@ 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() {
+	public synchronized void dispose() {
 		if (instance != null) {
 			instance.disposeInstance();
 			instance = null;