From c524e15267cb149f1f0c843a92c3f6b9739fc369 Mon Sep 17 00:00:00 2001 From: redkale Date: Mon, 21 Oct 2024 14:22:35 +0800 Subject: [PATCH] conn --- .../org/redkale/net/AsyncNioConnection.java | 2 +- .../java/org/redkale/net/PipelinePacket.java | 32 +++++++++++-------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/redkale/net/AsyncNioConnection.java b/src/main/java/org/redkale/net/AsyncNioConnection.java index b9afb449a..33d0255b5 100644 --- a/src/main/java/org/redkale/net/AsyncNioConnection.java +++ b/src/main/java/org/redkale/net/AsyncNioConnection.java @@ -521,7 +521,7 @@ abstract class AsyncNioConnection extends AsyncConnection { } @Override - public int read(byte b[], int off, int len) throws IOException { + public int read(byte[] b, int off, int len) throws IOException { if (b == null) { throw new NullPointerException(); } else if (off < 0 || len < 0 || len > b.length - off) { diff --git a/src/main/java/org/redkale/net/PipelinePacket.java b/src/main/java/org/redkale/net/PipelinePacket.java index 6de6d063f..d5980e6ba 100644 --- a/src/main/java/org/redkale/net/PipelinePacket.java +++ b/src/main/java/org/redkale/net/PipelinePacket.java @@ -12,10 +12,9 @@ import org.redkale.util.ByteTuple; * pipelineWrite写入包 * * @author zhangjx - * @param attachment类型 * @since 2.8.0 */ -public class PipelinePacket { +public class PipelinePacket { @ConvertColumn(index = 1) protected byte[] tupleBytes; @@ -27,35 +26,40 @@ public class PipelinePacket { protected int tupleLength; @ConvertColumn(index = 4) - protected CompletionHandler handler; + protected CompletionHandler handler; @ConvertColumn(index = 5) - protected T attach; + protected Object attach; public PipelinePacket() {} - public PipelinePacket(ByteTuple data, CompletionHandler handler) { + public PipelinePacket(ByteTuple data, CompletionHandler handler) { this(data, handler, null); } - public PipelinePacket(ByteTuple data, CompletionHandler handler, T attach) { + public PipelinePacket(ByteTuple data, CompletionHandler handler, Object attach) { this(data.content(), data.offset(), data.length(), handler, attach); } - public PipelinePacket(byte[] tupleBytes, CompletionHandler handler) { + public PipelinePacket(byte[] tupleBytes, CompletionHandler handler) { this(tupleBytes, 0, tupleBytes.length, handler, null); } - public PipelinePacket(byte[] tupleBytes, CompletionHandler handler, T attach) { + public PipelinePacket(byte[] tupleBytes, CompletionHandler handler, Object attach) { this(tupleBytes, 0, tupleBytes.length, handler, attach); } - public PipelinePacket(byte[] tupleBytes, int tupleOffset, int tupleLength, CompletionHandler handler) { + public PipelinePacket( + byte[] tupleBytes, int tupleOffset, int tupleLength, CompletionHandler handler) { this(tupleBytes, tupleOffset, tupleLength, handler, null); } public PipelinePacket( - byte[] tupleBytes, int tupleOffset, int tupleLength, CompletionHandler handler, T attach) { + byte[] tupleBytes, + int tupleOffset, + int tupleLength, + CompletionHandler handler, + Object attach) { this.tupleBytes = tupleBytes; this.tupleOffset = tupleOffset; this.tupleLength = tupleLength; @@ -87,19 +91,19 @@ public class PipelinePacket { this.tupleLength = tupleLength; } - public CompletionHandler getHandler() { + public CompletionHandler getHandler() { return handler; } - public void setHandler(CompletionHandler handler) { + public void setHandler(CompletionHandler handler) { this.handler = handler; } - public T getAttach() { + public Object getAttach() { return attach; } - public void setAttach(T attach) { + public void setAttach(Object attach) { this.attach = attach; } }