Specify UTF-8 encoding for all Java agent commands

[lttng-ust.git] / liblttng-ust-java-agent / java / lttng-ust-agent-common / org / lttng / ust / agent / client / SessiondDisableEventCommand.java

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 31d91e72e5a6d6e7e86e2bc5ae6f42d5fc6c625d..43ff4026346fa62a8a18ef5d402eda6272d17c8f 100644 (file)
--- 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
@@ -21,8 +21,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 +28,7 @@ import org.lttng.ust.agent.AbstractLttngAgent;
  * @author Alexandre Montplaisir
  * @author David Goulet
  */
-class SessiondDisableEventCommand implements ISessiondCommand {
+class SessiondDisableEventCommand extends SessiondCommand {
 
        /** Event name to disable from the tracing session */
        private final String eventName;
@@ -40,34 +38,24 @@ 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 ILttngAgentResponse execute(AbstractLttngAgent<?> agent) {
+       public LttngAgentResponse execute(ILttngTcpClientListener agent) {
                boolean success = agent.eventDisabled(this.eventName);
-               return (success ? ILttngAgentResponse.SUCESS_RESPONSE : DISABLE_EVENT_FAILURE_RESPONSE);
+               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 ILttngAgentResponse DISABLE_EVENT_FAILURE_RESPONSE = new ILttngAgentResponse() {
-
+       private static final LttngAgentResponse DISABLE_EVENT_FAILURE_RESPONSE = new LttngAgentResponse() {
                @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;
+                       return ReturnCode.CODE_UNKNOWN_LOGGER_NAME;
                }
        };
 }