You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/15 05:14:40 UTC

svn commit: r1673625 - /sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java

Author: cziegeler
Date: Wed Apr 15 03:14:40 2015
New Revision: 1673625

URL: http://svn.apache.org/r1673625
Log:
SLING-4620 : Slingstart plugin start goal exits even if launchpad.keep.running is set to true

Modified:
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java

Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java?rev=1673625&r1=1673624&r2=1673625&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/run/LauncherCallable.java Wed Apr 15 03:14:40 2015
@@ -171,7 +171,9 @@ public class LauncherCallable implements
         if ( this.configuration.getRunmode() != null && this.configuration.getRunmode().length() > 0 ) {
             args.add("-Dsling.run.modes=" + this.configuration.getRunmode());
         }
-        args.add("start");
+        if ( !this.environment.isShutdownOnExit() ) {
+            args.add("start");
+        }
 
         builder.command(args.toArray(new String[args.size()]));
         builder.directory(this.configuration.getFolder());