Port fix for bug 41752. Correct error message on exception in MemoryRealm. Patch...

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

diff --git a/java/org/apache/catalina/realm/MemoryRealm.java b/java/org/apache/catalina/realm/MemoryRealm.java
index c9de672..09b6730 100644 (file)
--- a/java/org/apache/catalina/realm/MemoryRealm.java
+++ b/java/org/apache/catalina/realm/MemoryRealm.java
@@ -301,7 +301,8 @@ public class MemoryRealm  extends RealmBase {
                 digester.parse(file);
             }
         } catch (Exception e) {
-            throw new LifecycleException("memoryRealm.readXml", e);
+            throw new LifecycleException
+                (sm.getString("memoryRealm.readXml"), e);
         } finally {
             digester.reset();
         }

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d068f77..5d8a2e4 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -26,6 +26,10 @@
         <bug>41739</bug> Correct handling of servlets with a load-on-startup
         value of zero. These are now the first servlets to be started. (markt)
       </fix>
+      <fix>
+        <bug>41752</bug> Correct error message on exception in MemoryRealm.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">