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

(-)org/apache/catalina/startup/WebRuleSet.java (+6 lines)
Lines 1131-1136 Link Here
1131 
                    "webRuleSet.absoluteOrderingCount"));
 1131 
                    "webRuleSet.absoluteOrderingCount"));
1132 
        } else {
 1132 
        } else {
1133 
            isAbsoluteOrderingSet = true;
 1133 
            isAbsoluteOrderingSet = true;
1134 
            WebXml webXml = (WebXml) digester.peek();
1135 
            webXml.setAbsoluteOrdering();
1136 
            if (digester.getLogger().isDebugEnabled()) {
1137 
                digester.getLogger().debug
1138 
                   (webXml.getClass().getName() + ".setAbsoluteOrdering()");
1139 
            }
1134 
        }
 1140 
        }
1135 
    }
 1141 
    }
1136 
}
 1142 
}
(-)org/apache/catalina/deploy/WebXml.java (+5 lines)
Lines 76-81 Link Here
76 
    // web.xml only elements
 76 
    // web.xml only elements
77 
    // Absolute Ordering
 77 
    // Absolute Ordering
78 
    private Set<String> absoluteOrdering = null;
 78 
    private Set<String> absoluteOrdering = null;
79 
    public void setAbsoluteOrdering() {
80 
        if (absoluteOrdering == null) {
81 
            absoluteOrdering = new LinkedHashSet<String>();
82 
        }
83 
    }
79 
    public void addAbsoluteOrdering(String fragmentName) {
 84 
    public void addAbsoluteOrdering(String fragmentName) {
80 
        if (absoluteOrdering == null) {
 85 
        if (absoluteOrdering == null) {
81 
            absoluteOrdering = new LinkedHashSet<String>();
 86 
            absoluteOrdering = new LinkedHashSet<String>();

Return to bug 54262