You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/01/10 13:54:40 UTC
qpid-broker-j git commit: QPID-8040: [Broker-J] [Transport] Ensure
that selection keys relating to non-accepting channels are always processed
even if cancelled
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 7d5a86962 -> 507b0c5b8
QPID-8040: [Broker-J] [Transport] Ensure that selection keys relating to non-accepting channels are always processed even if cancelled
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/507b0c5b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/507b0c5b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/507b0c5b
Branch: refs/heads/master
Commit: 507b0c5b825284e248c0d89b360d0972640931c6
Parents: 7d5a869
Author: Keith Wall <kw...@apache.org>
Authored: Wed Jan 10 13:47:45 2018 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Wed Jan 10 13:52:20 2018 +0000
----------------------------------------------------------------------
.../org/apache/qpid/server/transport/SelectorThread.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/507b0c5b/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java b/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
index c67a219..6c0ce8d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
@@ -177,7 +177,7 @@ class SelectorThread extends Thread
List<NonBlockingConnection> toBeScheduled = new ArrayList<>();
for (SelectionKey key : selectionKeys)
{
- if(key.isAcceptable())
+ if (key.attachment() instanceof NonBlockingNetworkTransport)
{
final NonBlockingNetworkTransport transport = (NonBlockingNetworkTransport) key.attachment();
final ServerSocketChannel channel = (ServerSocketChannel) key.channel();
@@ -198,11 +198,7 @@ class SelectorThread extends Thread
+ " because selector key is already cancelled", localSocketAddress, e);
}
- _workQueue.add(new Runnable()
- {
- @Override
- public void run()
- {
+ _workQueue.add(() -> {
try
{
_scheduler.incrementRunningCount();
@@ -237,7 +233,6 @@ class SelectorThread extends Thread
_scheduler.decrementRunningCount();
}
}
- }
});
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org