From 08817708d86c445a6e2d898d07278db9fb94b2e5 Mon Sep 17 00:00:00 2001 From: rjung Date: Sun, 26 Jun 2011 18:34:10 +0000 Subject: [PATCH] Use "eval exec" instead of "eval" for "catalina.sh run". Originally it was "exec" before we switched to "eval" which leaves an additional intermediate shell process hanging around. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1139904 13f79535-47bb-0310-9956-ffa450edef68 --- bin/catalina.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/catalina.sh b/bin/catalina.sh index 4b7006be7..0594fd3fb 100755 --- a/bin/catalina.sh +++ b/bin/catalina.sh @@ -312,7 +312,7 @@ elif [ "$1" = "run" ]; then echo "Using Security Manager" fi shift - eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $JAVA_OPTS $CATALINA_OPTS \ + eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ -Djava.security.manager \ -Djava.security.policy==\"$CATALINA_BASE/conf/catalina.policy\" \ @@ -321,7 +321,7 @@ elif [ "$1" = "run" ]; then -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ org.apache.catalina.startup.Bootstrap "$@" start else - eval \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $JAVA_OPTS $CATALINA_OPTS \ + eval exec \"$_RUNJAVA\" \"$LOGGING_CONFIG\" $JAVA_OPTS $CATALINA_OPTS \ -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ -Dcatalina.base=\"$CATALINA_BASE\" \ -Dcatalina.home=\"$CATALINA_HOME\" \ -- 2.11.0