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/18 19:58:17 UTC
svn commit: r1399751 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
Author: rmannibucau
Date: Thu Oct 18 17:58:16 2012
New Revision: 1399751
URL: http://svn.apache.org/viewvc?rev=1399751&view=rev
Log:
TOMEE-481 using bootstrap stop to shutdown remoteserver
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=1399751&r1=1399750&r2=1399751&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 Thu Oct 18 17:58:16 2012
@@ -110,6 +110,10 @@ public class RemoteServer {
}
public void start(final List<String> additionalArgs, final String cmd, boolean checkPortAvailable) {
+ cmd(additionalArgs, cmd, checkPortAvailable);
+ }
+
+ private void cmd(final List<String> additionalArgs, final String cmd, boolean checkPortAvailable) {
boolean ok = true;
if (checkPortAvailable) {
ok = !connect();
@@ -443,7 +447,7 @@ public class RemoteServer {
}
}
- private void shutdown() throws Exception {
+ private void forceShutdown() throws Exception {
String fcommand = command + Character.toString((char) 0); // SHUTDOWN + EOF
Socket socket = null;
@@ -459,6 +463,10 @@ public class RemoteServer {
}
}
+ private void shutdown() throws Exception {
+ cmd(Collections.EMPTY_LIST, "stop", false);
+ }
+
private boolean connect() {
return connect(1);
}
@@ -525,7 +533,7 @@ public class RemoteServer {
}
} else { // under windows we sometimes need to send shutdown multiple times (see connect())
try {
- shutdown();
+ forceShutdown();
} catch (Exception e) {
// no-op
}