Author: kkolinko
Date: Thu May 31 14:08:02 2012
New Revision: 1344732
URL: http://svn.apache.org/viewvc?rev=1344732&view=rev
Log:
Merged revision 1344725 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53115
Allow "catalina.bat run" to work even if %TEMP% contains spaces.
Note that it affects "run" command only.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/catalina.bat
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1344725
Modified: tomcat/tc7.0.x/trunk/bin/catalina.bat
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina.bat?rev=1344732&r1=1344731&r2=1344732&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/catalina.bat Thu May 31 14:08:02 2012
@@ -98,7 +98,7 @@ rem ------------------------------------
rem Suppress Terminate batch job on CTRL+C
if not ""%1"" == ""run"" goto mainEntry
-if ""%TEMP%"" == """" goto mainEntry
+if "%TEMP%" == "" goto mainEntry
if exist "%TEMP%\%~nx0.run" goto mainEntry
echo Y>"%TEMP%\%~nx0.run"
if not exist "%TEMP%\%~nx0.run" goto mainEntry
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1344732&r1=1344731&r2=1344732&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu May 31 14:08:02 2012
@@ -280,6 +280,10 @@
Properly mention <code>jsp_2_2.xsd</code> in the main LICENSE and
INSTALLLICENSE files. (kkolinko)
</fix>
+ <fix>
+ <bug>53115</bug>: Fix using the command "<code>catalina.bat run</code>"
+ when the value of <code>%TEMP%</code> contains spaces. (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
