Attachment 30931 Details for Bug 55656 – proposed patch

proposed patch

catalina.patch (text/plain), 1.25 KB, created by Roberto Benedetti on 2013-10-16 09:56:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roberto Benedetti

Created: 2013-10-16 09:56:54 UTC

Size: 1.25 KB

patch

obsolete

>diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
>index 5a43733..570dc81 100644
>--- a/java/org/apache/catalina/startup/Catalina.java
>+++ b/java/org/apache/catalina/startup/Catalina.java
>@@ -310,7 +310,7 @@ public class Catalina {
>         attrs.add("className");
>         fakeAttributes.put(Object.class, attrs);
>         digester.setFakeAttributes(fakeAttributes);
>-        digester.setClassLoader(StandardServer.class.getClassLoader());
>+        digester.setUseContextClassLoader(true);
>
>         // Configure the actions we will be using
>         digester.addObjectCreate("Server",
>@@ -430,6 +430,7 @@ public class Catalina {
>
>         // Initialize the digester
>         Digester digester = new Digester();
>+        digester.setUseContextClassLoader(true);
>
>         // Configure the rules we need for shutting down
>         digester.addObjectCreate("Server",
>@@ -459,7 +460,6 @@ public class Catalina {
>         if( s == null ) {
>             // Create and execute our Digester
>             Digester digester = createStopDigester();
>-            digester.setClassLoader(Thread.currentThread().getContextClassLoader());
>             File file = configFile();
>             FileInputStream fis = null;
>             try {

Actions: View

Attachments on bug 55656: 30931