CATALINA_BASE is always set, so simplify

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1146096 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/bin/catalina.bat b/bin/catalina.bat
index 56d5510..51068a6 100755 (executable)
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -137,12 +137,12 @@ rem but allow them to be specified in setenv.bat, in rare case when it is needed
 set CLASSPATH=
 
 rem Get standard environment variables
-if "%CATALINA_BASE%" == "" goto gotSetenvHome
-if exist "%CATALINA_BASE%\bin\setenv.bat" call "%CATALINA_BASE%\bin\setenv.bat"
-goto gotSetenvBase
-:gotSetenvHome
+if not exist "%CATALINA_BASE%\bin\setenv.bat" goto checkSetenvHome
+call "%CATALINA_BASE%\bin\setenv.bat"
+goto setenvDone
+:checkSetenvHome
 if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat"
-:gotSetenvBase
+:setenvDone
 
 rem Get standard Java environment variables
 if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath