diff --git a/.gitignore b/.gitignore index 4ecfdecd2..a37fcc7e8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ hs_err_pid* /target/ /.idea/ /redkale.iml +/ClientConnection.java +/nbactions.xml +/nb-configuration.xml diff --git a/src/main/java/org/redkale/net/AsyncIOThread.java b/src/main/java/org/redkale/net/AsyncIOThread.java index 2ca6efc78..dbae9b0ec 100644 --- a/src/main/java/org/redkale/net/AsyncIOThread.java +++ b/src/main/java/org/redkale/net/AsyncIOThread.java @@ -182,12 +182,12 @@ public class AsyncIOThread extends WorkThread { if (key.isConnectable()) { key.interestOps(key.interestOps() & ~SelectionKey.OP_CONNECT); conn.doConnect(); - } else if (conn.readCompletionHandler != null && key.isReadable()) { - key.interestOps(key.interestOps() & ~SelectionKey.OP_READ); - conn.doRead(true); } else if (conn.writeCompletionHandler != null && key.isWritable()) { key.interestOps(key.interestOps() & ~SelectionKey.OP_WRITE); conn.doWrite(true); + } else if (conn.readCompletionHandler != null && key.isReadable()) { + key.interestOps(key.interestOps() & ~SelectionKey.OP_READ); + conn.doRead(true); } } else { if (conn.readCompletionHandler != null && key.isReadable()) { diff --git a/src/main/java/org/redkale/net/AsyncNioConnection.java b/src/main/java/org/redkale/net/AsyncNioConnection.java index 8892eccfc..c33ca6207 100644 --- a/src/main/java/org/redkale/net/AsyncNioConnection.java +++ b/src/main/java/org/redkale/net/AsyncNioConnection.java @@ -397,9 +397,9 @@ abstract class AsyncNioConnection extends AsyncConnection { if (writeCount == 0) { if (hasRemain) { - writeCompleted = false; - writeTotal = totalCount; - //continue; //要全部输出完才返回 + //writeCompleted = false; + //writeTotal = totalCount; + continue; //要全部输出完才返回 } break; } else if (writeCount < 0) {