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

(-)java/org/apache/catalina/valves/rewrite/Substitution.java (-1 / +5 lines)
Lines 89-97 Link Here
89
        public RewriteMap map = null;
89
        public RewriteMap map = null;
90
        public String key;
90
        public String key;
91
        public String defaultValue = null;
91
        public String defaultValue = null;
92
        public int n;
92
        @Override
93
        @Override
93
        public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
94
        public String evaluate(Matcher rule, Matcher cond, Resolver resolver) {
94
            String result = map.lookup(key);
95
            String result = map.lookup(rule.group(n));
95
            if (result == null) {
96
            if (result == null) {
96
                result = defaultValue;
97
                result = defaultValue;
97
            }
98
            }
Lines 162-167 Link Here
162
                    } else {
163
                    } else {
163
                        newElement.key = sub.substring(colon + 1, close);
164
                        newElement.key = sub.substring(colon + 1, close);
164
                    }
165
                    }
166
                    if (newElement.key.startsWith("$")) {
167
                        newElement.n = Character.digit(newElement.key.charAt(1), 10);
168
                    }
165
                    pos = close + 1;
169
                    pos = close + 1;
166
                    elements.add(newElement);
170
                    elements.add(newElement);
167
                }
171
                }

Return to bug 57863