Author: rjung
Date: Thu Jul 16 20:50:41 2009
New Revision: 794849
URL: http://svn.apache.org/viewvc?rev=794849&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/container/tc5.5.x/catalina/src/bin/setclasspath.bat
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat?rev=794849&r1=794848&r2=794849&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat Thu Jul 16
20:50:41 2009
@@ -67,3 +67,4 @@
exit /b 1
:end
+exit /b 0
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=794849&r1=794848&r2=794849&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Thu Jul 16 20:50:41 2009
@@ -90,11 +90,6 @@
+1: markt, kkolinko
-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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
