Author: schultz
Date: Mon Jul 22 23:21:17 2013
New Revision: 1505844
URL: http://svn.apache.org/r1505844
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55268
- Replaced uses of "test -z" with "test "$FOO" = ." for better shell
compatibility.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/daemon.sh
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1505843
Modified: tomcat/tc7.0.x/trunk/bin/daemon.sh
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/daemon.sh?rev=1505844&r1=1505843&r2=1505844&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/daemon.sh (original)
+++ tomcat/tc7.0.x/trunk/bin/daemon.sh Mon Jul 22 23:21:17 2013
@@ -108,7 +108,7 @@ test ".$CATALINA_BASE" = . && CATALINA_B
test ".$CATALINA_MAIN" = . &&
CATALINA_MAIN=org.apache.catalina.startup.Bootstrap
test ".$JSVC" = . && JSVC="$CATALINA_BASE/bin/jsvc"
# Set the default service-start wait time if necessary
-test -z "$SERVICE_START_WAIT_TIME" && SERVICE_START_WAIT_TIME=10
+test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10
# Ensure that any user defined CLASSPATH variables are not used on startup,
# but allow them to be specified in setenv.sh, in rare case when it is needed.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
