revert fix that was ported by accident

2015-01-16 10:08:37 +00:00 · 2015-01-16 10:08:37 +00:00 · 0818587597
parent 475f2322e2
commit 0818587597
1 changed files with 6 additions and 14 deletions
--- a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
@ -243,20 +243,12 @@ public class ActiveMQBootstrap
         {
            try
            {
-               if (!spawned)
-               {
-                  manager.getActiveMQServer()
-                     .stop(true);
-                  manager.stop();
-                  manager = null;
-                  server = null;
-                  killFile.delete();
-               }
-               else
-               {
-                  killFile.delete();
-                  Runtime.getRuntime().halt(777);
-               }
+               manager.getActiveMQServer()
+                  .stop(true);
+               manager.stop();
+               manager = null;
+               server = null;
+               killFile.delete();
            }
            catch (Exception e)
            {