Author: rjung Date: Thu Jul 16 21:21:35 2009 New Revision: 794864 URL: http://svn.apache.org/viewvc?rev=794864&view=rev Log: Explicitely return value 0 if we return without error from setclasspath.bat. Otherwise errorlevel in catalina.bat is not reset.
catalina.bat checks for non-zero errorlevel after the call to setclasspath.bat and then fails silently, because it assumes setclasspath.bat to log any error. If there is an error above the call to setclasspath.bat, catalina.bat fails without any message. Since there is only very basic logic above the call to setclasspath.bat, let us reset errorlevel to ignore errors. Example: any "set myvar=" for an undefined variable myvar sets errorlevel to 1, although it is a correct statement, setting the variable to an empty value. Backport of r793669 from trunk. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/bin/setclasspath.bat Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=794864&r1=794863&r2=794864&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 21:21:35 2009 @@ -156,11 +156,6 @@ +1: fhanik -1: -* Correct errorlevel handling in setclasspath.bat - http://svn.apache.org/viewvc?rev=793669&view=rev - +1: rjung, kkolinko, markt - -1: - * Allow encoding to be specified for JULI FileHandler http://svn.apache.org/viewvc?rev=793882&view=rev +1: kkolinko, markt, rjung Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?rev=794864&r1=794863&r2=794864&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Thu Jul 16 21:21:35 2009 @@ -88,3 +88,4 @@ exit /b 1 :end +exit /b 0 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org