X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-common%2Forg%2Flttng%2Fust%2Fagent%2Fclient%2FSessiondDisableEventCommand.java;h=ff8eff3a35debd1d41d349328833664b276c8c62;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=ee9d519f65a8fd699a07623974a0fc54041dabde;hpb=932535693bb8a719c40f63141dbfac786388ed4a;p=lttng-ust.git

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 ee9d519f..ff8eff3a 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
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2015 - EfficiOS Inc., Alexandre Montplaisir <alexmonthy@efficios.com>
- * 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) 2015 EfficiOS Inc.
+ * Copyright (C) 2015 Alexandre Montplaisir <alexmonthy@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
  */
 
 package org.lttng.ust.agent.client;
@@ -21,8 +11,6 @@ package org.lttng.ust.agent.client;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import org.lttng.ust.agent.AbstractLttngAgent;
-
 /**
  * Session daemon command indicating to the Java agent that some events were
  * disabled in the tracing session.
@@ -30,7 +18,18 @@ import org.lttng.ust.agent.AbstractLttngAgent;
  * @author Alexandre Montplaisir
  * @author David Goulet
  */
-class SessiondDisableEventCommand implements ISessiondCommand {
+class SessiondDisableEventCommand extends SessiondCommand {
+
+	/**
+	 * Response sent when the disable-event command asks to disable an
+	 * unknown event.
+	 */
+	private static final LttngAgentResponse DISABLE_EVENT_FAILURE_RESPONSE = new LttngAgentResponse() {
+		@Override
+		public ReturnCode getReturnCode() {
+			return ReturnCode.CODE_UNKNOWN_LOGGER_NAME;
+		}
+	};
 
 	/** Event name to disable from the tracing session */
 	private final String eventName;
@@ -40,24 +39,20 @@ class SessiondDisableEventCommand implements ISessiondCommand {
 			throw new IllegalArgumentException();
 		}
 		ByteBuffer buf = ByteBuffer.wrap(data);
-		buf.order(ByteOrder.LITTLE_ENDIAN);
-		eventName = new String(data).trim();
+		buf.order(ByteOrder.BIG_ENDIAN);
+		eventName = new String(data, SESSIOND_PROTOCOL_CHARSET).trim();
 	}
 
 	@Override
-	public LttngAgentResponse execute(AbstractLttngAgent<?> agent) {
+	public LttngAgentResponse execute(ILttngTcpClientListener agent) {
 		boolean success = agent.eventDisabled(this.eventName);
 		return (success ? LttngAgentResponse.SUCESS_RESPONSE : DISABLE_EVENT_FAILURE_RESPONSE);
 	}
 
-	/**
-	 * Response sent when the disable-event command asks to disable an
-	 * unknown event.
-	 */
-	private static final LttngAgentResponse DISABLE_EVENT_FAILURE_RESPONSE = new LttngAgentResponse() {
-		@Override
-		public ReturnCode getReturnCode() {
-			return ReturnCode.CODE_UNK_LOGGER_NAME;
-		}
-	};
+	@Override
+	public String toString() {
+		return "SessiondDisableEventCommand["
+				+ "eventName=" + eventName
+				+"]";
+	}
 }