Author: mturk
Date: Thu Feb 23 18:21:33 2012
New Revision: 1292878
URL: http://svn.apache.org/viewvc?rev=1292878&view=rev
Log:
Fix BZ52750. Correctly parse command options
Modified:
tomcat/tc7.0.x/trunk/bin/daemon.sh
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/bin/daemon.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/daemon.sh?rev=1292878&r1=1292877&r2=1292878&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/daemon.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/daemon.sh Thu Feb 23 18:21:33 2012
@@ -34,9 +34,9 @@ while [ -h "$ARG0" ]; do
done
DIRNAME="`dirname $ARG0`"
PROGRAM="`basename $ARG0`"
-for o
+while [ ".$1" != . ]
do
- case "$o" in
+ case "$1" in
--java-home )
JAVA_HOME="$2"
shift; shift;
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=1292878&r1=1292877&r2=1292878&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Feb 23 18:21:33 2012
@@ -66,6 +66,10 @@
</subsection>
<subsection name="Other">
<changelog>
+ <fix>
+ <bug>52750</bug>: Fix the way how daemon.sh parses command options so
+ that more then one can be provided. (mturk)
+ </fix>
<update>
Rearrange <code>validate-eoln</code> target in <code>build.xml</code>
so that it could be run ahead of compilation. (kkolinko)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
