Merge branch 'jetty-8'

2013-01-29 14:09:22 -06:00 · 2013-01-29 14:09:22 -06:00 · 54c6928f58
parent e26c60e073 01f7bc1e12
commit 54c6928f58
1 changed files with 1 additions and 1 deletions
--- a/jetty-distribution/src/main/resources/bin/jetty.sh
+++ b/jetty-distribution/src/main/resources/bin/jetty.sh
@ -307,7 +307,7 @@ fi
 #####################################################
 if [ -z "$JETTY_RUN" ] 
 then
-  JETTY_RUN=$(findDirectory -w /var/run /usr/var/run /tmp)
+  JETTY_RUN=$(findDirectory -w /var/run /usr/var/run $JETTY_HOME /tmp)
 fi

 #####################################################