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

(-)org/apache/jasper/compiler/TagPluginManager.java (-3 / +14 lines)
Lines 68-81 Link Here
68
        });
68
        });
69
69
70
    }
70
    }
71
 
71
    
72
    public static final String DEFAULT_TAG_PLUGINS_XML = System.getProperty("org.apache.jasper.compiler.tagplugins.DEFAULT_TAG_PLUGINS_XML");
73
    
72
    private void init(ErrorDispatcher err) throws JasperException {
74
    private void init(ErrorDispatcher err) throws JasperException {
73
        if (initialized)
75
        if (initialized)
74
            return;
76
            return;
75
77
76
        InputStream is = ctxt.getResourceAsStream(TAG_PLUGINS_XML);
78
        InputStream is = ctxt.getResourceAsStream(TAG_PLUGINS_XML);
77
        if (is == null)
79
        if (is == null) {
78
            return;
80
        	if (DEFAULT_TAG_PLUGINS_XML != null) {
81
	        	is = ctxt.getClassLoader().getResourceAsStream(DEFAULT_TAG_PLUGINS_XML);
82
                if (is == null) {
83
	        		return;
84
	        	}
85
        	}
86
        	else {
87
                return;
88
        	}
89
        }
79
90
80
        TreeNode root = (new ParserUtils()).parseXMLDocument(TAG_PLUGINS_XML,
91
        TreeNode root = (new ParserUtils()).parseXMLDocument(TAG_PLUGINS_XML,
81
                                                             is);
92
                                                             is);

Return to bug 54240