Permalink
Browse files

Merge branch '2.2.x'

Conflicts:
	build.gradle
	build.properties
  • Loading branch information...
2 parents 01c8710 + 5e0f5a2 commit a09363cf2b162765f0a45efa0b6cb5c3a7e68351 @graemerocher graemerocher committed Oct 9, 2012
View
@@ -1,2 +1,2 @@
-grails.version=2.3.0.BUILD-SNAPSHOT
+grails.version=2.2.0.BUILD-SNAPSHOT
@@ -27,6 +27,7 @@ import org.apache.tomcat.util.scan.StandardJarScanner
import org.springframework.util.ReflectionUtils
import org.apache.catalina.Loader
import org.apache.catalina.Context
+import grails.util.Environment
/**
* Serves the app, without packaging as a war and runs it in the same JVM.
*/
@@ -137,7 +138,9 @@ class InlineExplodedTomcatServer extends TomcatServer {
}
tomcat.start()
- IsolatedTomcat.startKillSwitch(tomcat, httpPort)
+ if(Environment.isFork()) {
+ IsolatedTomcat.startKillSwitch(tomcat, httpPort)
+ }
}
void stop() {
@@ -133,7 +133,7 @@ target(keepServerAlive: "Idles the script, ensuring that the server stays runnin
killFile.delete()
}
- while (keepRunning && Boolean.getBoolean("TomcatKillSwitch.active")) {
+ while (keepRunning || Boolean.getBoolean("TomcatKillSwitch.active")) {
sleep(recompileFrequency * 1000)
// Check whether the kill file exists. This is a hack for the functional

0 comments on commit a09363c

Please sign in to comment.