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

[pm...@apache.org]

Author: pmouawad
Date: Thu Apr 16 19:59:36 2015
New Revision: 1674142

URL: http://svn.apache.org/r1674142
Log:
Bug 57821 - Command-line option "-X --remoteexit" doesn't work since 2.13 (regression related to Bug 57500)
Bugzilla Id: 57821

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
    jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.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=1674142&r1=1674141&r2=1674142&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Thu Apr 16 19:59:36 2015
@@ -814,6 +814,7 @@ public class JMeter implements JMeterPlu
                 distributedRunner.setStdout(System.out);
                 distributedRunner.setStdErr(System.err);
                 distributedRunner.init(hosts, tree);
+                engines.addAll(distributedRunner.getEngines());
                 distributedRunner.start();
             }
             startUdpDdaemon(engines);

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java?rev=1674142&r1=1674141&r2=1674142&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/DistributedRunner.java Thu Apr 16 19:59:36 2015
@@ -24,12 +24,14 @@ import java.io.PrintStream;
 import java.net.MalformedURLException;
 import java.rmi.NotBoundException;
 import java.rmi.RemoteException;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.logging.LoggingManager;
@@ -262,4 +264,11 @@ public class DistributedRunner {
             // enjoy the silence
         }
     }
+
+    /**
+     * @return {@link Collection} of {@link JMeterEngine}
+     */
+    public Collection<? extends JMeterEngine> getEngines() {
+        return engines.values();
+    }
 }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1674142&r1=1674141&r2=1674142&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Apr 16 19:59:36 2015
@@ -138,7 +138,7 @@ Summary
 
 <h3>Functions</h3>
 <ul>
-<li><bug>57825</bug>__Random function fails if min value is equal to max value (regression related to <bug>54453</bug>)</li>
+<li><bug>57825</bug>__Random function fails if min value is equal to max value (regression related to <bugzilla>54453</bugzilla>)</li>
 </ul>
 
 <h3>I18N</h3>
@@ -148,6 +148,7 @@ Summary
 <h3>General</h3>
     <li><bug>54826</bug>Don't fail on long strings in JSON responses when displaying them as JSON in View Results Tree.</li>
     <li><bug>57734</bug>Maven transient dependencies are incorrect for 2.13</li>
+    <li><bug>57821</bug>Command-line option "-X --remoteexit" doesn't work since 2.13 (regression related to <bugzilla>57500</bugzilla>)</li>
 <ul>
 
 </ul>