You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/10/31 11:31:17 UTC
svn commit: r1404077 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
Author: rmannibucau
Date: Wed Oct 31 10:31:17 2012
New Revision: 1404077
URL: http://svn.apache.org/viewvc?rev=1404077&view=rev
Log:
don't debug stop command when shutting down remoteserver to avoid infinite loop
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1404077&r1=1404076&r2=1404077&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Wed Oct 31 10:31:17 2012
@@ -39,7 +39,7 @@ public class RemoteServer {
public static final String SERVER_SHUTDOWN_COMMAND = "server.shutdown.command";
public static final String OPENEJB_SERVER_DEBUG = "openejb.server.debug";
- private final boolean debug = options.get(OPENEJB_SERVER_DEBUG, false);
+ private boolean debug = options.get(OPENEJB_SERVER_DEBUG, false);
private final boolean profile = options.get("openejb.server.profile", false);
private final boolean tomcat;
private final String javaOpts = System.getProperty("java.opts");
@@ -467,7 +467,13 @@ public class RemoteServer {
}
private void shutdown() throws Exception {
- cmd(Collections.EMPTY_LIST, "stop", false);
+ final boolean originalDebug = debug;
+ debug = false; // make sure we don't debug the stop command otherwise in debug mode we will not stop
+ try {
+ cmd(Collections.EMPTY_LIST, "stop", false);
+ } finally {
+ debug = originalDebug;
+ }
}
private boolean connect() {