From 9e7e4cc177fb4b563c69955313a5a5e4eabbde5e Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Thu, 16 Mar 2023 22:09:58 +0800
Subject: [PATCH] =?UTF-8?q?http=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../redkale/net/http/HttpDispatcherServlet.java    |  2 +-
 src/main/java/org/redkale/net/http/Rest.java       | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/redkale/net/http/HttpDispatcherServlet.java b/src/main/java/org/redkale/net/http/HttpDispatcherServlet.java
index e574ba011..9f58b7e9f 100644
--- a/src/main/java/org/redkale/net/http/HttpDispatcherServlet.java
+++ b/src/main/java/org/redkale/net/http/HttpDispatcherServlet.java
@@ -400,7 +400,7 @@ public class HttpDispatcherServlet extends DispatcherServlet<String, HttpContext
                 }
             }
         }
-        if (this.lazyHeaders && (!Rest.isSimpleRestDyn(servlet) || servlet instanceof WebSocketServlet)) {
+        if (this.lazyHeaders && !Rest.isSimpleRestDyn(servlet)) {
             this.lazyHeaders = false;
             if (context != null) {
                 context.lazyHeaders = this.lazyHeaders; //启动后运行过程中执行addServlet
diff --git a/src/main/java/org/redkale/net/http/Rest.java b/src/main/java/org/redkale/net/http/Rest.java
index 57c97fe4b..ef7d4de1f 100644
--- a/src/main/java/org/redkale/net/http/Rest.java
+++ b/src/main/java/org/redkale/net/http/Rest.java
@@ -10,10 +10,10 @@ import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.*;
 import java.lang.reflect.*;
-import java.net.InetSocketAddress;
-import java.nio.channels.CompletionHandler;
+import java.net.*;
+import java.nio.channels.*;
 import java.util.*;
-import java.util.concurrent.CompletionStage;
+import java.util.concurrent.*;
 import org.redkale.annotation.Comment;
 import org.redkale.annotation.*;
 import static org.redkale.asm.ClassWriter.COMPUTE_FRAMES;
@@ -24,9 +24,9 @@ import org.redkale.convert.*;
 import org.redkale.convert.json.*;
 import org.redkale.mq.*;
 import org.redkale.net.*;
-import org.redkale.net.sncp.Sncp;
+import org.redkale.net.sncp.*;
 import org.redkale.service.*;
-import org.redkale.source.Flipper;
+import org.redkale.source.*;
 import org.redkale.util.*;
 
 /**
@@ -497,7 +497,7 @@ public final class Rest {
         cw.visit(V11, ACC_PUBLIC + ACC_FINAL + ACC_SUPER, newDynName, null, supDynName, null);
         { //RestDyn
             av0 = cw.visitAnnotation(Type.getDescriptor(RestDyn.class), true);
-            av0.visit("simple", false);
+            av0.visit("simple", false); //WebSocketServlet必须要解析http-header
             {
                 AnnotationVisitor av1 = av0.visitArray("types");
                 av1.visit(null, Type.getType("L" + newDynConsumerFullName.replace('.', '/') + ";"));
@@ -1558,7 +1558,7 @@ public final class Rest {
             av0.visit("value", Type.getType(Type.getDescriptor(serviceType)));
             av0.visitEnd();
         }
-        boolean dynsimple = baseServletType != HttpServlet.class; //有自定义的BaseServlet会存在读取header的操作
+        boolean dynsimple = baseServletType == HttpServlet.class; //有自定义的BaseServlet会存在读取header的操作
         //获取所有可以转换成HttpMapping的方法
         int methodidex = 0;
         final MessageMultiConsumer mmc = serviceType.getAnnotation(MessageMultiConsumer.class);