svn commit: r1432638 - in /jmeter/trunk: src/core/org/apache/jmeter/JMeter.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Sun Jan 13 15:28:12 2013
New Revision: 1432638

URL: http://svn.apache.org/viewvc?rev=1432638&view=rev
Log:
Bug 54414 - Remote Test should not start if one of the engines fails to start correctly
Bugzilla Id: 54414

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1432638&r1=1432637&r2=1432638&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sun Jan 13 15:28:12 2013
@@ -31,6 +31,7 @@ import java.net.InetAddress;
 import java.net.MalformedURLException;
 import java.net.SocketException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Enumeration;
@@ -789,6 +790,7 @@ public class JMeter implements JMeterPlu
                 engines.add(engine);
             } else {
                 java.util.StringTokenizer st = new java.util.StringTokenizer(remote_hosts_string, ",");//$NON-NLS-1$
+                List<String> failingEngines = new ArrayList<String>(st.countTokens());
                 while (st.hasMoreElements()) {
                     String el = (String) st.nextElement();
                     println("Configuring remote engine for " + el);
@@ -797,6 +799,7 @@ public class JMeter implements JMeterPlu
                     if (null != eng) {
                         engines.add(eng);
                     } else {
+                        failingEngines.add(el);
                         println("Failed to configure "+el);
                     }
                 }
@@ -804,6 +807,9 @@ public class JMeter implements JMeterPlu
                     println("No remote engines were started.");
                     return;
                 }
+                if(failingEngines.size()>0) {
+                    throw new IllegalArgumentException("The following remote engines did not start correclty:"+failingEngines);
+                }
                 println("Starting remote engines");
                 log.info("Starting remote engines");
                 long now=System.currentTimeMillis();

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1432638&r1=1432637&r2=1432638&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Jan 13 15:28:12 2013
@@ -263,6 +263,7 @@ to the elements View Results Tree, Asser
 <li><bugzilla>54268</bugzilla> - Improve CPU and memory usage</li>
 <li><bugzilla>54376</bugzilla> - ScopePanel : Allow configuring more precisely scopes</li>
 <li><bugzilla>54412</bugzilla> - Changing JMeter defaults to ensure better performances by default</li>
+<li><bugzilla>54414</bugzilla> - Remote Test should not start if one of the engines fails to start correctly</li>
 </ul>
 
 <h2>Non-functional changes</h2>