From: Alexandre Montplaisir <alexmonthy@efficios.com>
Date: Thu, 6 Aug 2015 17:41:50 +0000 (-0400)
Subject: Fix: Send the correct Java agent return code when disabling events
X-Git-Tag: v2.8.0-rc1~112
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2c2403496ae4416e535ff9eb689f6be25af6e47f;p=lttng-ust.git

Fix: Send the correct Java agent return code when disabling events

When receiving a "disable event" command from the sessiond for
an event that is not known, the Java agent should send the
"unknown logger name" return code, not the "invalid command" one.

Signed-off-by: Alexandre Montplaisir <alexmonthy@efficios.com>
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/client/SessiondDisableEventCommand.java b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java
index 39d14b0d..31d91e72 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondDisableEventCommand.java
@@ -47,6 +47,27 @@ class SessiondDisableEventCommand implements ISessiondCommand {
 	@Override
 	public ILttngAgentResponse execute(AbstractLttngAgent<?> agent) {
 		boolean success = agent.eventDisabled(this.eventName);
-		return (success ? ILttngAgentResponse.SUCESS_RESPONSE : ILttngAgentResponse.FAILURE_RESPONSE);
+		return (success ? ILttngAgentResponse.SUCESS_RESPONSE : DISABLE_EVENT_FAILURE_RESPONSE);
 	}
+
+	/**
+	 * Response sent when the disable-event command asks to disable an
+	 * unknown event.
+	 */
+	private static final ILttngAgentResponse DISABLE_EVENT_FAILURE_RESPONSE = new ILttngAgentResponse() {
+
+		@Override
+		public ReturnCode getReturnCode() {
+			return ReturnCode.CODE_UNK_LOGGER_NAME;
+		}
+
+		@Override
+		public byte[] getBytes() {
+			byte data[] = new byte[INT_SIZE];
+			ByteBuffer buf = ByteBuffer.wrap(data);
+			buf.order(ByteOrder.BIG_ENDIAN);
+			buf.putInt(getReturnCode().getCode());
+			return data;
+		}
+	};
 }