svn commit: r1366880 - in /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app: ControlListener.java Main.java

[fm...@apache.org]

Author: fmeschbe
Date: Sun Jul 29 17:36:19 2012
New Revision: 1366880

URL: http://svn.apache.org/viewvc?rev=1366880&view=rev
Log:
SLING-2489 Main.terminateVM should be an instance method for the unit test to overwrite it and prevent terminating the build during unit testing

Modified:
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/ControlListener.java
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/Main.java

Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/ControlListener.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/ControlListener.java?rev=1366880&r1=1366879&r2=1366880&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/ControlListener.java (original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/ControlListener.java Sun Jul 29 17:36:19 2012
@@ -245,7 +245,7 @@ class ControlListener implements Runnabl
         // the VM should stop. If there are still some non-daemon threads
         // active, this will not happen, so we force this here ...
         Main.info("Apache Sling terminated, exiting Java VM", null);
-        Main.terminateVM(0);
+        this.slingMain.terminateVM(0);
     }
 
     // ---------- socket support

Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/Main.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/Main.java?rev=1366880&r1=1366879&r2=1366880&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/Main.java (original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/app/Main.java Sun Jul 29 17:36:19 2012
@@ -116,13 +116,13 @@ public class Main {
         // check for control commands
         int rc = main.doControlAction();
         if (rc >= 0) {
-            terminateVM(rc);
+            main.terminateVM(rc);
         }
 
         // finally start Sling
         if (!main.doStart()) {
             error("Failed to start Sling; terminating", null);
-            terminateVM(1);
+            main.terminateVM(1);
         }
     }
 
@@ -285,7 +285,8 @@ public class Main {
      *
      * @param status The application status exit code.
      */
-    static void terminateVM(final int status) {
+    // default accessor to enable overwriting for unit tests
+    void terminateVM(final int status) {
         System.exit(status);
     }
 
@@ -888,7 +889,7 @@ public class Main {
                 Main.info("Restarting Framework and Apache Sling", null);
                 if (!Main.this.doStart(null)) {
                     Main.error("Failed to restart Sling; terminating", null);
-                    Main.terminateVM(1);
+                    Main.this.terminateVM(1);
                 }
 
             } else {
@@ -906,7 +907,7 @@ public class Main {
 
                 if (!started) {
                     Main.error("Failed to restart Sling; terminating", null);
-                    Main.terminateVM(1);
+                    Main.this.terminateVM(1);
                 }
             }
         }