svn commit: r1784215 - /jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java

[se...@apache.org]

Author: sebb
Date: Thu Feb 23 23:03:54 2017
New Revision: 1784215

URL: http://svn.apache.org/viewvc?rev=1784215&view=rev
Log:
A bit more debug; don't look for the registry if we already have its instance

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

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=1784215&r1=1784214&r2=1784215&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:03:54 2017
@@ -111,10 +111,12 @@ public final class RemoteJMeterEngineImp
                     + "\tCan be overridden by defining the system property 'java.rmi.server.hostname' - see jmeter-server script file");
         }
         log.debug("This = {}", this);
+        Registry reg = null;
         if (CREATE_SERVER){
             log.info("Creating RMI registry (server.rmi.create=true)");
             try {
-                LocateRegistry.createRegistry(this.rmiPort);
+                reg = LocateRegistry.createRegistry(this.rmiPort);
+                System.err.println("Created registry: " + reg);
             } catch (RemoteException e){
                 String msg="Problem creating registry: "+e;
                 log.warn(msg);
@@ -123,8 +125,13 @@ public final class RemoteJMeterEngineImp
             }
         }
         try {
-            Registry reg = LocateRegistry.getRegistry(this.rmiPort);
+            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);
             log.info("Bound to registry on port {}", this.rmiPort);
         } catch (Exception ex) {
             log.error("rmiregistry needs to be running to start JMeter in server mode. {}", ex.toString());