svn commit: r1612435 - in /tomee/tomee/trunk: container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java maven/pom.xml

[an...@apache.org]

Author: andygumbrecht
Date: Mon Jul 21 23:47:13 2014
New Revision: 1612435

URL: http://svn.apache.org/r1612435
Log:
Shutdown RemoteServer, but don't wait forever.

Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
    tomee/tomee/trunk/maven/pom.xml

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1612435&r1=1612434&r2=1612435&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Mon Jul 21 23:47:13 2014
@@ -24,7 +24,6 @@ import org.apache.openejb.util.Join;
 import org.apache.openejb.util.Pipe;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.net.InetSocketAddress;
@@ -126,14 +125,31 @@ public class RemoteServer {
     }
 
     public void destroy() {
+
         stop();
+
         if (server != null) {
+            final Process sp = server;
+            final Thread t = new Thread(new Runnable() {
+                @Override
+                public void run() {
             try {
-                server.waitFor();
+                        sp.waitFor();
             } catch (final InterruptedException e) {
                 // no-op
             }
         }
+            }, "RemoteServer-destroy");
+
+            t.start();
+            try {
+                t.join(15000);
+            } catch (final InterruptedException e) {
+                //Ignore
+            } finally {
+                server.destroy();
+    }
+        }
     }
 
     public void start() {
@@ -435,16 +451,14 @@ public class RemoteServer {
     }
 
     public void stop() {
-        if (!serverHasAlreadyBeenStarted) {
             try {
                 shutdown();
             } catch (final Exception e) {
-                if (verbose) {
+            if (verbose && !serverHasAlreadyBeenStarted) {
                     e.printStackTrace(System.err);
                 }
             }
         }
-    }
 
     public void forceStop() throws Exception {
         shutdown();
@@ -487,7 +501,7 @@ public class RemoteServer {
             if (socket != null) {
                 try {
                     socket.close();
-                } catch (final IOException e) {
+                } catch (final Exception e) {
                     // Ignore
                 }
             }

Modified: tomee/tomee/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/pom.xml?rev=1612435&r1=1612434&r2=1612435&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/pom.xml (original)
+++ tomee/tomee/trunk/maven/pom.xml Mon Jul 21 23:47:13 2014
@@ -46,12 +46,12 @@
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
         <artifactId>maven-plugin-annotations</artifactId>
-        <version>3.1</version>
+        <version>3.3</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.17</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>