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 2016/02/11 14:49:46 UTC
svn commit: r1729828 -
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
Author: kwall
Date: Thu Feb 11 13:49:45 2016
New Revision: 1729828
URL: http://svn.apache.org/viewvc?rev=1729828&view=rev
Log:
QPID-7001: [Java Broker] NIO - leave selection key's attachment registered throughout the channel's lifespan
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java?rev=1729828&r1=1729827&r2=1729828&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/SelectorThread.java Thu Feb 11 13:49:45 2016
@@ -134,7 +134,7 @@ class SelectorThread extends Thread
toBeScheduled.add(connection);
try
{
- connection.getSocketChannel().register(_selector, 0);
+ connection.getSocketChannel().register(_selector, 0, connection);
}
catch (ClosedChannelException | CancelledKeyException e)
{
@@ -171,7 +171,7 @@ class SelectorThread extends Thread
try
{
- channel.register(_selector, 0);
+ channel.register(_selector, 0, transport);
}
catch (ClosedChannelException e)
{
@@ -216,7 +216,7 @@ class SelectorThread extends Thread
{
try
{
- key.channel().register(_selector, 0);
+ key.channel().register(_selector, 0, connection);
}
catch (ClosedChannelException e)
{
@@ -433,6 +433,11 @@ class SelectorThread extends Thread
@Override
public void run()
{
+ if (LOGGER.isDebugEnabled())
+ {
+ LOGGER.debug("Cancelling selector on accepting port {} ",
+ socketChannel.socket().getLocalSocketAddress());
+ }
SelectionKey selectionKey = socketChannel.keyFor(_selectionTasks[0].getSelector());
if (selectionKey != null)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org