From 7d1770da8a51fa5c31dcc1c5cbd6be40386fe9dd Mon Sep 17 00:00:00 2001 From: Redkale <8730487+redkale@users.noreply.github.com> Date: Tue, 19 Jan 2021 17:40:08 +0800 Subject: [PATCH] --- src/org/redkale/net/TcpNioAsyncConnection.java | 4 ++-- src/org/redkale/net/nio/NioThread.java | 2 +- src/org/redkale/net/nio/NioThreadGroup.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/redkale/net/TcpNioAsyncConnection.java b/src/org/redkale/net/TcpNioAsyncConnection.java index f58e449fb..aa48112e0 100644 --- a/src/org/redkale/net/TcpNioAsyncConnection.java +++ b/src/org/redkale/net/TcpNioAsyncConnection.java @@ -372,7 +372,7 @@ public class TcpNioAsyncConnection extends AsyncConnection { public void doRead() { try { - final boolean invokeDirect = this.ioThread.inSameThread(); + final boolean invokeDirect = this.ioThread.inCurrThread(); int totalCount = 0; boolean hasRemain = true; if (invokeDirect && this.readByteBuffer == null) { @@ -439,7 +439,7 @@ public class TcpNioAsyncConnection extends AsyncConnection { public void doWrite() { try { - final boolean invokeDirect = this.ioThread.inSameThread(); + final boolean invokeDirect = this.ioThread.inCurrThread(); int totalCount = 0; boolean hasRemain = true; while (invokeDirect && hasRemain) { diff --git a/src/org/redkale/net/nio/NioThread.java b/src/org/redkale/net/nio/NioThread.java index 75fd9f2e7..a2eae695b 100644 --- a/src/org/redkale/net/nio/NioThread.java +++ b/src/org/redkale/net/nio/NioThread.java @@ -84,7 +84,7 @@ public class NioThread extends Thread { } } - public boolean inSameThread() { + public boolean inCurrThread() { return this.localThread == Thread.currentThread(); } diff --git a/src/org/redkale/net/nio/NioThreadGroup.java b/src/org/redkale/net/nio/NioThreadGroup.java index 0dc84a7c8..f29dbd870 100644 --- a/src/org/redkale/net/nio/NioThreadGroup.java +++ b/src/org/redkale/net/nio/NioThreadGroup.java @@ -72,7 +72,7 @@ public class NioThreadGroup { if (key.selector() != thread.selector) throw new RuntimeException("NioThread.selector not the same to SelectionKey.selector"); if ((key.interestOps() & opt) != 0) return; key.interestOps(key.interestOps() | opt); - if (thread.inSameThread()) return; + if (thread.inCurrThread()) return; //非IO线程中 key.selector().wakeup(); }