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%2FSessiondListLoggersCommand.java;h=1c7ef9b400f019e7611c36b5bb349c99cc628b5d;hb=b5eac5d48dddb45c7110bf1c5289af09630496e5;hp=f5ad9c50443f6ec805ced0191e2456600693e148;hpb=932535693bb8a719c40f63141dbfac786388ed4a;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java
index f5ad9c50..1c7ef9b4 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/org/lttng/ust/agent/client/SessiondListLoggersCommand.java
@@ -20,10 +20,7 @@ package org.lttng.ust.agent.client;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.lttng.ust.agent.AbstractLttngAgent;
+import java.util.Collection;
 
 /**
  * Session daemon command asking the Java agent to list its registered loggers,
@@ -32,15 +29,14 @@ import org.lttng.ust.agent.AbstractLttngAgent;
  * @author Alexandre Montplaisir
  * @author David Goulet
  */
-class SessiondListLoggersCommand implements ISessiondCommand {
+class SessiondListLoggersCommand extends SessiondCommand {
 
 	@Override
-	public LttngAgentResponse execute(AbstractLttngAgent<?> agent) {
-		final List<String> loggerList = new ArrayList<String>();
+	public LttngAgentResponse execute(ILttngTcpClientListener agent) {
+		final Collection<String> loggerList = agent.listAvailableEvents();
 		int dataSize = 0;
 
-		for (String event : agent.listEnabledEvents()) {
-			loggerList.add(event);
+		for (String event : agent.listAvailableEvents()) {
 			dataSize += event.length() + 1;
 		}
 
@@ -51,10 +47,10 @@ class SessiondListLoggersCommand implements ISessiondCommand {
 
 		private final static int SIZE = 12;
 
-		private final List<String> loggers;
+		private final Collection<String> loggers;
 		private final int dataSize;
 
-		public SessiondListLoggersResponse(List<String> loggers, int dataSize) {
+		public SessiondListLoggersResponse(Collection<String> loggers, int dataSize) {
 			this.loggers = loggers;
 			this.dataSize = dataSize;
 		}
@@ -77,7 +73,7 @@ class SessiondListLoggersCommand implements ISessiondCommand {
 			buf.putInt(loggers.size());
 
 			for (String logger : loggers) {
-				buf.put(logger.getBytes());
+				buf.put(logger.getBytes(SESSIOND_PROTOCOL_CHARSET));
 				/* NULL terminated byte after the logger name. */
 				buf.put((byte) 0x0);
 			}