This commit is contained in:
@@ -126,7 +126,8 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
|
|||||||
List<HttpServlet> list = removeHttpServlet(predicateEntry, predicateFilter);
|
List<HttpServlet> list = removeHttpServlet(predicateEntry, predicateFilter);
|
||||||
return list == null || list.isEmpty() ? null : list.get(0);
|
return list == null || list.isEmpty() ? null : list.get(0);
|
||||||
}
|
}
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
public <T extends WebSocket> HttpServlet removeHttpServlet(Class<T> websocketOrServletType) {
|
public <T extends WebSocket> HttpServlet removeHttpServlet(Class<T> websocketOrServletType) {
|
||||||
Predicate<MappingEntry> predicateEntry = (t) -> {
|
Predicate<MappingEntry> predicateEntry = (t) -> {
|
||||||
Class type = t.servlet.getClass();
|
Class type = t.servlet.getClass();
|
||||||
@@ -379,6 +380,7 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
|
|||||||
servlet._prefix = prefix.toString();
|
servlet._prefix = prefix.toString();
|
||||||
putServlet(servlet);
|
putServlet(servlet);
|
||||||
}
|
}
|
||||||
|
servlet.preInit(null, conf);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ public class HttpServlet extends Servlet<HttpContext, HttpRequest, HttpResponse>
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void preInit(HttpContext context, AnyValue config) {
|
void preInit(HttpContext context, AnyValue config) {
|
||||||
|
if (this.mappings != null) return; //无需重复preInit
|
||||||
String path = _prefix == null ? "" : _prefix;
|
String path = _prefix == null ? "" : _prefix;
|
||||||
WebServlet ws = this.getClass().getAnnotation(WebServlet.class);
|
WebServlet ws = this.getClass().getAnnotation(WebServlet.class);
|
||||||
if (ws != null && !ws.repair()) path = "";
|
if (ws != null && !ws.repair()) path = "";
|
||||||
|
|||||||
Reference in New Issue
Block a user