lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
wentch
2016-01-18 18:26:03 +08:00
parent 1acf86c437
commit 9174277545
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/redkale/net/http/HttpPrepareServlet.java
View File

@@ -86,12 +86,13 @@ public final class HttpPrepareServlet extends PrepareServlet<HttpContext, HttpRe
public void addHttpServlet(HttpServlet servlet, String prefix, AnyValue conf, String... mappings) { public void addHttpServlet(HttpServlet servlet, String prefix, AnyValue conf, String... mappings) {
if (prefix == null) prefix = ""; if (prefix == null) prefix = "";
for (String mapping : mappings) { for (String mapping : mappings) {
if (!prefix.isEmpty()) mapping = prefix + mapping;
if (contains(mapping, '.', '*', '{', '[', '(', '|', '^', '$', '+', '?', '\\')) { //是否是正则表达式)) if (contains(mapping, '.', '*', '{', '[', '(', '|', '^', '$', '+', '?', '\\')) { //是否是正则表达式))
if (mapping.charAt(0) != '^') mapping = '^' + mapping; if (mapping.charAt(0) != '^') mapping = '^' + mapping;
if (mapping.endsWith("/*")) { if (mapping.endsWith("/*")) {
mapping = prefix + mapping.substring(0, mapping.length() - 1) + ".*"; mapping = mapping.substring(0, mapping.length() - 1) + ".*";
} else { } else {
mapping = prefix + mapping + "$"; mapping = mapping + "$";
} }
if (regArray == null) { if (regArray == null) {
regArray = new SimpleEntry[1]; regArray = new SimpleEntry[1];
@@ -101,7 +102,7 @@ public final class HttpPrepareServlet extends PrepareServlet<HttpContext, HttpRe
regArray[regArray.length - 1] = new SimpleEntry<>(Pattern.compile(mapping).asPredicate(), servlet); regArray[regArray.length - 1] = new SimpleEntry<>(Pattern.compile(mapping).asPredicate(), servlet);
} }
} else if (mapping != null && !mapping.isEmpty()) { } else if (mapping != null && !mapping.isEmpty()) {
strmaps.put(prefix + mapping, servlet); strmaps.put(mapping, servlet);
} }
} }
servlet._conf = conf; servlet._conf = conf;