From 9355f0499ff8df40fe571907eaf0e8373166b963 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 11 Apr 2016 18:57:42 -0400 Subject: [PATCH] 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 --- .../org/lttng/ust/agent/LTTngAgent.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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; -- 2.34.1