Author: sebb
Date: Wed Sep 14 14:07:56 2011
New Revision: 1170636

URL: http://svn.apache.org/viewvc?rev=1170636&view=rev
Log:
-X only usable in non-Gui mode

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1170636&r1=1170635&r2=1170636&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Wed Sep 14 
14:07:56 2011
@@ -218,7 +218,7 @@ public class JMeter implements JMeterPlu
 
     private Properties remoteProps; // Properties to be sent to remote servers
 
-    private boolean remoteStop; // should remote engines be stopped at end of 
GUI test?
+    private boolean remoteStop; // should remote engines be stopped at end of 
non-GUI test?
 
     /**
      * Starts up JMeter in GUI mode
@@ -270,10 +270,11 @@ public class JMeter implements JMeterPlu
         String error = parser.getErrorString();
         if (error == null){// Check option combinations
             boolean gui = parser.getArgumentById(NONGUI_OPT)==null;
-            boolean remoteStart = parser.getArgumentById(REMOTE_OPT)!=null
-                               || 
parser.getArgumentById(REMOTE_OPT_PARAM)!=null;
-            if (gui && remoteStart) {
-                error = "-r and -R are only valid in non-GUI mode";
+            boolean nonGuiOnly = parser.getArgumentById(REMOTE_OPT)!=null
+                               || 
parser.getArgumentById(REMOTE_OPT_PARAM)!=null
+                               || parser.getArgumentById(REMOTE_STOP)!=null;
+            if (gui && nonGuiOnly) {
+                error = "-r and -R and -X are only valid in non-GUI mode";
             }
         }
         if (null != error) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to