X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-common%2Forg%2Flttng%2Fust%2Fagent%2Fclient%2FSessiondCommand.java;h=7cde4a3598a516c5cbcd1beb4562e03ce4ea9475;hb=22191ffd5680d377e6f92f783c9b2302708732ab;hp=fd5bb1de89030579734d158b7e577acb028c6aa7;hpb=2520968a954ca5fd7cfabf65fe619d00dd8e8631;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java
index fd5bb1de..7cde4a35 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondCommand.java
@@ -19,6 +19,7 @@
 package org.lttng.ust.agent.client;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
 
 /**
  * Base class to represent all commands sent from the session daemon to the Java
@@ -29,6 +30,12 @@ import java.nio.ByteBuffer;
  */
 abstract class SessiondCommand {
 
+	/**
+	 * Encoding that should be used for the strings in the sessiond agent
+	 * protocol on the socket.
+	 */
+	protected static final Charset SESSIOND_PROTOCOL_CHARSET = Charset.forName("UTF-8");
+
 	enum CommandType {
 		/** List logger(s). */
 		CMD_LIST(1),
@@ -87,6 +94,6 @@ abstract class SessiondCommand {
 
 		byte[] stringBytes = new byte[length];
 		buffer.get(stringBytes);
-		return new String(stringBytes).trim();
+		return new String(stringBytes, SESSIOND_PROTOCOL_CHARSET).trim();
 	}
 }