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%2FSessiondListLoggersCommand.java;h=1c7ef9b400f019e7611c36b5bb349c99cc628b5d;hb=5c588ccfbdb647157a678ce4211e6563edb035e3;hp=c06eaaad95e09db12565d841a7b75c88ada37194;hpb=3165c2f51abe3093f4c5512b499e33cb380b387d;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 c06eaaad..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,8 +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 java.util.Collection; /** * Session daemon command asking the Java agent to list its registered loggers, @@ -30,15 +29,14 @@ import java.util.List; * @author Alexandre Montplaisir * @author David Goulet */ -class SessiondListLoggersCommand implements ISessiondCommand { +class SessiondListLoggersCommand extends SessiondCommand { @Override public LttngAgentResponse execute(ILttngTcpClientListener agent) { - final List loggerList = new ArrayList(); + final Collection loggerList = agent.listAvailableEvents(); int dataSize = 0; - for (String event : agent.listEnabledEvents()) { - loggerList.add(event); + for (String event : agent.listAvailableEvents()) { dataSize += event.length() + 1; } @@ -49,10 +47,10 @@ class SessiondListLoggersCommand implements ISessiondCommand { private final static int SIZE = 12; - private final List loggers; + private final Collection loggers; private final int dataSize; - public SessiondListLoggersResponse(List loggers, int dataSize) { + public SessiondListLoggersResponse(Collection loggers, int dataSize) { this.loggers = loggers; this.dataSize = dataSize; } @@ -75,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); }