diff --git a/src/main/java/org/redkale/net/client/ClientCodec.java b/src/main/java/org/redkale/net/client/ClientCodec.java index a34b9c741..c958bed78 100644 --- a/src/main/java/org/redkale/net/client/ClientCodec.java +++ b/src/main/java/org/redkale/net/client/ClientCodec.java @@ -83,7 +83,7 @@ public abstract class ClientCodec respFuture = connection.pollRespFuture(cr.getRequestid()); + ClientFuture respFuture = connection.pollRespFuture(cr.getRequestid()); if (respFuture != null) { if (respFuture.request != cr.request) { connection.dispose(new RedkaleException("request pipeline error")); @@ -116,7 +116,7 @@ public abstract class ClientCodec respFuture, P message, Throwable exc) { + void responseComplete(boolean halfCompleted, ClientFuture respFuture, P message, Throwable exc) { R request = respFuture.request; Traces.currentTraceid(request.getTraceid()); AsyncIOThread readThread = connection.channel.getReadIOThread(); @@ -144,7 +144,7 @@ public abstract class ClientCodec { Traces.currentTraceid(request.traceid); diff --git a/src/main/java/org/redkale/net/client/ClientRequest.java b/src/main/java/org/redkale/net/client/ClientRequest.java index bd6d7c001..d237228d6 100644 --- a/src/main/java/org/redkale/net/client/ClientRequest.java +++ b/src/main/java/org/redkale/net/client/ClientRequest.java @@ -30,7 +30,7 @@ public abstract class ClientRequest { protected String traceid; - //只会在ClientCodec的读线程里调用 + //只会在ClientCodec的读线程里调用, 将ClientResult转成最终结果对象 Function respTransfer; public abstract void writeTo(ClientConnection conn, ByteArray array); diff --git a/src/main/java/org/redkale/net/client/ClientResponse.java b/src/main/java/org/redkale/net/client/ClientResponse.java index 780aa903e..e242e6d2c 100644 --- a/src/main/java/org/redkale/net/client/ClientResponse.java +++ b/src/main/java/org/redkale/net/client/ClientResponse.java @@ -6,6 +6,7 @@ package org.redkale.net.client; import java.io.Serializable; +import org.redkale.annotation.Nullable; /** * @@ -21,6 +22,7 @@ import java.io.Serializable; */ public class ClientResponse { + @Nullable protected R request; //服务端返回一个不存在的requestid,可能为null protected P message;