X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng%2Forg.eclipse.tracecompass.lttng2.control.ui%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Finternal%2Flttng2%2Fcontrol%2Fui%2Fviews%2Fservice%2FLTTngControlService.java;h=998db7eddfb8928f81a9c941eaa083fe51cef579;hb=9ee91a867744ffc34478dfe9bf8840e8a40e3a2c;hp=133c171e2fd20f698f839d51e9f13f93a48d6434;hpb=a1fded88c081389be8aabbe8e92859a67dbb2ef5;p=deliverable%2Ftracecompass.git

diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlService.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlService.java
index 133c171e2f..998db7eddf 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlService.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlService.java
@@ -68,7 +68,6 @@ import org.eclipse.tracecompass.tmf.remote.core.shell.ICommandShell;
  */
 public class LTTngControlService implements ILttngControlService {
 
-
     // ------------------------------------------------------------------------
     // Attributes
     // ------------------------------------------------------------------------
@@ -779,8 +778,9 @@ public class LTTngControlService implements ILttngControlService {
     public void enableEvents(String sessionName, String channelName, List<String> eventNames, boolean isKernel, String filterExpression, IProgressMonitor monitor) throws ExecutionException {
 
         ICommandInput command = createCommand(LTTngControlServiceConstants.COMMAND_ENABLE_EVENT);
+        boolean isAllEvents = ALL_EVENTS.equals(eventNames);
 
-        if (eventNames == null || eventNames.isEmpty()) {
+        if (isAllEvents || (eventNames == null) || (eventNames.isEmpty())) {
             command.add(LTTngControlServiceConstants.OPTION_ALL);
         } else {
             command.add(toCsv(eventNames));
@@ -800,7 +800,9 @@ public class LTTngControlService implements ILttngControlService {
             command.add(channelName);
         }
 
-        command.add(LTTngControlServiceConstants.OPTION_TRACEPOINT);
+        if (!isAllEvents) {
+            command.add(LTTngControlServiceConstants.OPTION_TRACEPOINT);
+        }
 
         if (filterExpression != null) {
             command.add(LTTngControlServiceConstants.OPTION_FILTER);