This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push: new 5bb4fbe Fix bug 64969, make RemoteJMeterEngineImpl instance release completely when RemoteJMeterEngineImpl#rexit() invoked 5bb4fbe is described below commit 5bb4fbe389204290c61afbd12bac66a8ca928755 Author: pmouawad <p.moua...@ubik-ingenierie.com> AuthorDate: Wed Dec 9 09:21:21 2020 +0100 Fix bug 64969, make RemoteJMeterEngineImpl instance release completely when RemoteJMeterEngineImpl#rexit() invoked --- .../java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java | 8 ++++++++ xdocs/changes.xml | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java index 2750b92..087130c 100644 --- a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java +++ b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java @@ -19,11 +19,13 @@ package org.apache.jmeter.engine; import java.io.File; import java.net.InetAddress; +import java.rmi.NoSuchObjectException; import java.rmi.NotBoundException; import java.rmi.RemoteException; import java.rmi.registry.LocateRegistry; import java.rmi.registry.Registry; import java.rmi.server.ServerNotActiveException; +import java.rmi.server.UnicastRemoteObject; import java.util.HashMap; import java.util.Properties; @@ -206,6 +208,12 @@ public final class RemoteJMeterEngineImpl extends java.rmi.server.UnicastRemoteO log.warn("{} is not bound", JMETER_ENGINE_RMI_NAME, e); } log.info("Unbound from registry"); + try { + UnicastRemoteObject.unexportObject(this, false); + } catch (NoSuchObjectException e) { + log.warn("{} not longer exists", this, e); + } + log.info("Unexported RemoteJMeterEngineImpl"); // Help with garbage control JMeterUtils.helpGC(); et.start(); diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 538184a..a1de93d 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -164,6 +164,7 @@ Summary <li><bug>64957</bug>When importing example test plan JMeter displays an NullPointerException</li> <li><bug>64961</bug>Darklaf: On Windows 7, NPE in BasicEditorPaneUI.cleanDisplayProperties with Darklaf Intellij</li> <li><bug>64963</bug>Blank comment tooltip is visible</li> + <li><bug>64969</bug>RemoteJMeterEngineImpl#rexit doesn't unexport RemoteJMeterEngineImpl on exit. Contributed by luo_isaiah at qq.com</li> </ul> <!-- =================== Thanks =================== --> @@ -173,6 +174,7 @@ Summary </p> <ul> <li>Ori Marko (orimarko at gmail.com)</li> + <li>罗寅卓 (luo_isaiah at qq.com)</li> </ul> <p>We also thank bug reporters who helped us improve JMeter.</p> <ul>