/*
- * Copyright (C) 2015-2016 - 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-2016 EfficiOS Inc.
+ * Copyright (C) 2015-2016 Alexandre Montplaisir <alexmonthy@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
*/
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
*/
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),
* formatted.
*/
protected static String readNextString(ByteBuffer buffer) {
- int length = buffer.getInt();
- if (length < 0) {
+ int nbBytes = buffer.getInt();
+ if (nbBytes < 0) {
/* The string length should be positive */
return null;
}
- if (length == 0) {
+ if (nbBytes == 0) {
/* The string is explicitly an empty string */
return "";
}
- byte[] stringBytes = new byte[length];
+ byte[] stringBytes = new byte[nbBytes];
buffer.get(stringBytes);
- return new String(stringBytes).trim();
+ return new String(stringBytes, SESSIOND_PROTOCOL_CHARSET).trim();
}
}