svn commit: r1784217 - in /jmeter/trunk: build.xml src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java

[se...@apache.org]

Author: sebb
Date: Thu Feb 23 23:37:27 2017
New Revision: 1784217

URL: http://svn.apache.org/viewvc?rev=1784217&view=rev
Log:
Revert most changes as host has been updated

Modified:
    jmeter/trunk/build.xml
    jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1784217&r1=1784216&r2=1784217&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Thu Feb 23 23:37:27 2017
@@ -2452,7 +2452,6 @@ run JMeter unless all the JMeter jars ar
           <arg value="-j"/>
           <arg value="${batchtestserver.out}/${batchtestserver.log}"/>
           <arg value="-Dserver_port=${rmi_port}"/>
-          <arg value="-Djava.rmi.server.hostname=127.0.0.1"/> <!-- TEMP DEBUG -->
           <arg value="-s"/>
           <arg value="-Jserver.exitaftertest=true"/>
           <arg value="${rmi_hostname_option}"/>
@@ -2462,7 +2461,7 @@ run JMeter unless all the JMeter jars ar
         <!-- Increase as necessary to ensure server has time to start -->
         <sleep seconds="2"/>
         <antcall target="batchtest">
-          <param name="remote" value="-R127.0.0.1:${rmi_port}"/>  <!-- TEMP DEBUG -->
+          <param name="remote" value="-Rlocalhost:${rmi_port}"/>
           <param name="taskname" value="client"/>
           <!-- Default the test name so we can override with a parameter -->
         </antcall>

Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java?rev=1784217&r1=1784216&r2=1784217&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java Thu Feb 23 23:37:27 2017
@@ -125,10 +125,10 @@ public final class RemoteJMeterEngineImp
             }
         }
         try {
-            if (reg == null) {
+//            if (reg == null) {
                 System.err.println("Locating registry");
                 reg = LocateRegistry.getRegistry(this.rmiPort);
-            }
+//            }
             System.err.println("About to rebind registry: " + reg);
             reg.rebind(JMETER_ENGINE_RMI_NAME, this);
             System.err.println("Bound registry as: " + reg);