View | Details | Raw Unified | Return to bug 46264
Collapse All | Expand All

(-)a/java/org/apache/catalina/startup/ContextConfig.java (-3 / +8 lines)
Lines 129-135 public class ContextConfig Link Here
129
     * The <code>Digester</code> we will use to process web application
129
     * The <code>Digester</code> we will use to process web application
130
     * context files.
130
     * context files.
131
     */
131
     */
132
    protected static Digester contextDigester = null;
132
    protected Digester contextDigester = null;
133
    
133
    
134
134
135
    /**
135
    /**
Lines 829-836 public class ContextConfig Link Here
829
        // Called from StandardContext.init()
829
        // Called from StandardContext.init()
830
830
831
        if (contextDigester == null){
831
        if (contextDigester == null){
832
            contextDigester = createContextDigester();
832
            synchronized (this) {
833
            contextDigester.getParser();
833
                if (contextDigester == null) {
834
                    Digester tmpDigester = createContextDigester();
835
                    tmpDigester.getParser();
836
                    contextDigester = tmpDigester;
837
                }
838
            }
834
        }
839
        }
835
840
836
        if (log.isDebugEnabled())
841
        if (log.isDebugEnabled())

Return to bug 46264