From 7bab2742a5ccdedfe1576f56226a607daa3aae07 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Sat, 5 Oct 2024 22:19:52 +0800
Subject: [PATCH] =?UTF-8?q?ProtocolCodec.readRegister=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/redkale/net/ProtocolCodec.java    | 3 ++-
 src/main/java/org/redkale/net/Request.java          | 4 ++--
 src/main/java/org/redkale/net/Response.java         | 2 +-
 src/main/java/org/redkale/net/http/HttpRequest.java | 4 ++--
 src/main/java/org/redkale/net/sncp/SncpRequest.java | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/redkale/net/ProtocolCodec.java b/src/main/java/org/redkale/net/ProtocolCodec.java
index 278f46b19..9946cd0b9 100644
--- a/src/main/java/org/redkale/net/ProtocolCodec.java
+++ b/src/main/java/org/redkale/net/ProtocolCodec.java
@@ -114,7 +114,8 @@ class ProtocolCodec implements CompletionHandler<Integer, ByteBuffer> {
             return;
         }
         try {
-            channel.readRegisterInIOThread(this);
+            //channel.readRegisterInIOThread(this);
+            channel.readRegister(this);
         } catch (Exception te) {
             channel.dispose(); // response.init(channel); 在调用之前异常
             if (context.logger.isLoggable(Level.FINEST)) {
diff --git a/src/main/java/org/redkale/net/Request.java b/src/main/java/org/redkale/net/Request.java
index 80fab985c..669031bfa 100644
--- a/src/main/java/org/redkale/net/Request.java
+++ b/src/main/java/org/redkale/net/Request.java
@@ -37,7 +37,7 @@ public abstract class Request<C extends Context> {
 
     // 请求包是否完成读取完毕，用于ProtocolCodec继续读的判断条件
     // 需要在readHeader方法中设置
-    protected boolean completed;
+    protected boolean readCompleted;
 
     protected int pipelineIndex;
 
@@ -109,7 +109,7 @@ public abstract class Request<C extends Context> {
         pipelineIndex = 0;
         pipelineCount = 0;
         pipelineCompleted = false;
-        completed = false;
+        readCompleted = false;
         keepAlive = false;
         attributes.clear();
         annotations = null;
diff --git a/src/main/java/org/redkale/net/Response.java b/src/main/java/org/redkale/net/Response.java
index f41c500f6..3b2ab1845 100644
--- a/src/main/java/org/redkale/net/Response.java
+++ b/src/main/java/org/redkale/net/Response.java
@@ -348,7 +348,7 @@ public abstract class Response<C extends Context, R extends Request<C>> {
             AsyncConnection conn = removeChannel();
             if (conn != null && conn.protocolCodec != null) {
                 this.responseConsumer.accept(this);
-                if (!request.completed) {
+                if (!request.readCompleted) {
                     conn.readRegister(conn.protocolCodec);
                     this.readRegistered = true;
                 }
diff --git a/src/main/java/org/redkale/net/http/HttpRequest.java b/src/main/java/org/redkale/net/http/HttpRequest.java
index 859a315dc..6b09ee6e7 100644
--- a/src/main/java/org/redkale/net/http/HttpRequest.java
+++ b/src/main/java/org/redkale/net/http/HttpRequest.java
@@ -400,8 +400,8 @@ public class HttpRequest extends Request<HttpContext> {
                 // 文件上传必须设置keepAlive为false，因为文件过大时用户不一定会skip掉多余的数据
                 this.keepAlive = false;
             }
-            // completed=true时ProtocolCodec会继续读下一个request
-            this.completed = !this.boundary && !maybews;
+            // readCompleted=true时ProtocolCodec会继续读下一个request
+            this.readCompleted = !this.boundary && !maybews;
             this.bodyBytes.clear();
             this.readState = READ_STATE_BODY;
         }
diff --git a/src/main/java/org/redkale/net/sncp/SncpRequest.java b/src/main/java/org/redkale/net/sncp/SncpRequest.java
index 19d49bd55..c2b1f7e96 100644
--- a/src/main/java/org/redkale/net/sncp/SncpRequest.java
+++ b/src/main/java/org/redkale/net/sncp/SncpRequest.java
@@ -125,8 +125,8 @@ public class SncpRequest extends Request<SncpContext> {
                 return -1;
             }
             this.traceid = this.header.getTraceid();
-            // completed=true时ProtocolCodec会继续读下一个request
-            this.completed = true;
+            // readCompleted=true时ProtocolCodec会继续读下一个request
+            this.readCompleted = true;
             this.readState = READ_STATE_BODY;
         }
         // ---------------------body----------------------------------