svn commit: r1401339 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java

[rmannibucau]

Author: rmannibucau
Date: Tue Oct 23 16:21:04 2012
New Revision: 1401339

URL: http://svn.apache.org/viewvc?rev=1401339&view=rev
Log:
no need of hack to kill tomee since we use stop command

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=1401339&r1=1401338&r2=1401339&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
 Tue Oct 23 16:21:04 2012
@@ -418,7 +418,6 @@ public class RemoteServer {
     }
 
     public void stop() {
-        Thread processKiller = null;
         if (!serverHasAlreadyBeenStarted) {
             try {
                 if (verbose) {
@@ -426,23 +425,8 @@ public class RemoteServer {
                 }
 
                 shutdown();
-
-                if (server != null) {
-                    processKiller = new ProcessKillerThread();
-                    processKiller.start();
-                    server.waitFor();
-                    processKiller.interrupt();
-                    server = null;
-                }
             } catch (Exception e) {
                 e.printStackTrace(System.err);
-                if (processKiller != null) {
-                    try {
-                        processKiller.join();
-                    } catch (InterruptedException e1) {
-                        processKiller.interrupt();
-                    }
-                }
             }
         }
     }
@@ -503,45 +487,4 @@ public class RemoteServer {
 
         return true;
     }
-
-    public class ProcessKillerThread extends Thread {
-        private static final int MAX_TRIES = 10;
-        private static final int SLEEP_INC = 500;
-
-        @Override
-        public void run() {
-            long sleep = 0; // recall immediately shutdown (win issue)
-            int tries = MAX_TRIES;
-            while (tries > 0) {
-                try {
-                    Thread.sleep(sleep);
-                    sleep += SLEEP_INC;
-                    if (server != null) {
-                        server.exitValue();
-                    }
-                    break; // server == null or exitValue returned (= process 
stopped)
-                } catch (IllegalThreadStateException itse) {
-                    tries--;
-                    if (tries == 0) { // kill if possible
-                        if (server != null) {
-                            server.destroy();
-                            try {
-                                server.waitFor();
-                            } catch (InterruptedException e) {
-                                // no-op
-                            }
-                        }
-                    } else { // under windows we sometimes need to send 
shutdown multiple times (see connect())
-                        try {
-                            forceShutdown();
-                        } catch (Exception e) {
-                            // no-op
-                        }
-                    }
-                } catch (InterruptedException e) {
-                    // no-op
-                }
-            }
-        }
-    }
 }