fix 41786

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

diff --git a/bin/catalina.bat b/bin/catalina.bat
index c223dba..b7fd7de 100644 (file)
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -94,7 +94,7 @@ if not "%CATALINA_TMPDIR%" == "" goto gotTmpdir
 set CATALINA_TMPDIR=%CATALINA_BASE%\temp
 :gotTmpdir
 
-if not exist "%CATALINA_HOME%\conf\logging.properties" goto noJuli
+if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuli
 set JAVA_OPTS=%JAVA_OPTS% -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
 :noJuli
 

diff --git a/bin/catalina.sh b/bin/catalina.sh
index 1c6534d..b447eb6 100755 (executable)
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -162,7 +162,7 @@ if $cygwin; then
 fi
 
 # Set juli LogManager if it is present
-if [ -r "$CATALINA_HOME"/conf/logging.properties ]; then
+if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
   JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
 fi
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 88c722e..d92a736 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -18,6 +18,9 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        <bug>41786  </bug> Incorrect reference to catalina_home in catalina.sh/bat Patch provided by Mike Hanafey (fhanik)
+      </fix>
+      <fix>
         <bug>41703</bug> SingleSignOnMessage invalid setter, patch provided by Nils Hammar (fhanik)
       </fix>
       <fix>