jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1747998 - in /jmeter/trunk: src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java xdocs/changes.xml
Date Sun, 12 Jun 2016 13:18:42 GMT
Author: fschumacher
Date: Sun Jun 12 13:18:41 2016
New Revision: 1747998

URL: http://svn.apache.org/viewvc?rev=1747998&view=rev
Log:
Get rid of UnmarshalException on stopping when -X option is used.

Bugzilla Id: 59400

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

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=1747998&r1=1747997&r2=1747998&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java Sun Jun 12
13:18:41 2016
@@ -196,7 +196,15 @@ public final class RemoteJMeterEngineImp
     @Override
     public void rexit() throws RemoteException {
         log.info("Exiting");
-        backingEngine.exit();
+        // Bug 59400 - allow rexit() to return
+        Thread et = new Thread() {
+            @Override
+            public void run() {
+                log.info("Stopping the backing engine");
+                backingEngine.exit();
+            }  
+        };
+        et.setDaemon(false);
         // Tidy up any objects we created
         Registry reg = LocateRegistry.getRegistry(this.rmiPort);        
         try {
@@ -207,6 +215,7 @@ public final class RemoteJMeterEngineImp
         log.info("Unbound from registry");
         // Help with garbage control
         JMeterUtils.helpGC();
+        et.start();
     }
 
     @Override

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1747998&r1=1747997&r2=1747998&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Jun 12 13:18:41 2016
@@ -151,6 +151,7 @@ Summary
 
 <h3>General</h3>
 <ul>
+    <li><bug>59400</bug>Get rid of UnmarshalException on stopping when
<code>-X</code> option is used.</li>
     <li><bug>59607</bug>JMeter crashes when reading large test plan (greater
than 2g). Based on fix by Felix Draxler (felix.draxler at sap.com)</li>
     <li><bug>59621</bug>Error count in report dashboard is one off.</li>
     <li><bug>59657</bug>Only set font in JSyntaxTextArea, when property
<code>jsyntaxtextarea.font.family</code> is set.</li>



Mime
View raw message