Author: kkolinko Date: Mon May 24 10:48:03 2010 New Revision: 947595 URL: http://svn.apache.org/viewvc?rev=947595&view=rev Log: Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48840 Port the fix from catalina.sh to tool-wrapper.sh as well.
Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=947595&r1=947594&r2=947595&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Mon May 24 10:48:03 2010 @@ -78,13 +78,6 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?view=revision&revision=749019 -1: -* Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48840 - Port the fix from catalina.sh to tool-wrapper.sh as well. - http://svn.apache.org/viewvc?rev=946686&view=rev - (apply to /container/catalina/src/bin/tool-wrapper.sh) - +1: kkolinko, markt, rjung - -1: - * Fix ByteChunk.indexOf(String, ...) when the string is of length 1 http://svn.apache.org/viewvc?rev=945231&view=rev +1: kkolinko Modified: tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh?rev=947595&r1=947594&r2=947595&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/bin/tool-wrapper.sh Mon May 24 10:48:03 2010 @@ -42,7 +42,7 @@ CLASSPATH= # Get standard environment variables PRGDIR=`dirname "$PRG"` -CATALINA_HOME=`cd "$PRGDIR/.." ; pwd` +CATALINA_HOME=`cd "$PRGDIR/.." >/dev/null; pwd` if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then . "$CATALINA_HOME"/bin/setenv.sh fi Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=947595&r1=947594&r2=947595&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Mon May 24 10:48:03 2010 @@ -51,7 +51,8 @@ </update> <fix> <bug>48840</bug>: Swallow output (if any) from use of cd when determining - $CATALINA_HOME in catalina.sh script. Patch provided by mdietze. (markt) + $CATALINA_HOME in catalina.sh and tool-wrapper.sh scripts. Based on patch + provided by mdietze. (markt/kkolinko) </fix> <fix> <bug>49236</bug>: Do not use indexing when packing Tomcat JARs. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org