From f3763dbf72b1ac3c0e9e26d7a0f55f538cce5ef4 Mon Sep 17 00:00:00 2001
From: Redkale <8730487+redkale@users.noreply.github.com>
Date: Wed, 5 Sep 2018 16:41:44 +0800
Subject: [PATCH]

---
 src/org/redkale/net/http/HttpPrepareServlet.java | 4 +++-
 src/org/redkale/net/http/HttpServlet.java        | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/org/redkale/net/http/HttpPrepareServlet.java b/src/org/redkale/net/http/HttpPrepareServlet.java
index 382606b1d..316774c64 100644
--- a/src/org/redkale/net/http/HttpPrepareServlet.java
+++ b/src/org/redkale/net/http/HttpPrepareServlet.java
@@ -126,7 +126,8 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
         List<HttpServlet> list = removeHttpServlet(predicateEntry, predicateFilter);
         return list == null || list.isEmpty() ? null : list.get(0);
     }
-@SuppressWarnings("unchecked")
+
+    @SuppressWarnings("unchecked")
     public <T extends WebSocket> HttpServlet removeHttpServlet(Class<T> websocketOrServletType) {
         Predicate<MappingEntry> predicateEntry = (t) -> {
             Class type = t.servlet.getClass();
@@ -379,6 +380,7 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
             servlet._prefix = prefix.toString();
             putServlet(servlet);
         }
+        servlet.preInit(null, conf);
     }
 
     /**
diff --git a/src/org/redkale/net/http/HttpServlet.java b/src/org/redkale/net/http/HttpServlet.java
index 468cd3f9f..423b48414 100644
--- a/src/org/redkale/net/http/HttpServlet.java
+++ b/src/org/redkale/net/http/HttpServlet.java
@@ -84,6 +84,7 @@ public class HttpServlet extends Servlet<HttpContext, HttpRequest, HttpResponse>
 
     @SuppressWarnings("unchecked")
     void preInit(HttpContext context, AnyValue config) {
+        if (this.mappings != null) return; //无需重复preInit
         String path = _prefix == null ? "" : _prefix;
         WebServlet ws = this.getClass().getAnnotation(WebServlet.class);
         if (ws != null && !ws.repair()) path = "";