qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject qpid-broker-j git commit: QPID-8040: [Broker-J] Handle CancelledKeyException on registering of selector keys
Date Wed, 06 Dec 2017 14:36:14 GMT
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 1c06450ac -> 34e38ae1e


QPID-8040: [Broker-J] Handle CancelledKeyException on registering of selector keys


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/34e38ae1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/34e38ae1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/34e38ae1

Branch: refs/heads/master
Commit: 34e38ae1ed3a5a519e875657142955f8e42766c7
Parents: 1c06450
Author: Alex Rudyy <orudyy@apache.org>
Authored: Wed Dec 6 14:36:04 2017 +0000
Committer: Alex Rudyy <orudyy@apache.org>
Committed: Wed Dec 6 14:36:04 2017 +0000

----------------------------------------------------------------------
 .../java/org/apache/qpid/server/transport/SelectorThread.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/34e38ae1/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 28dbfc5..c67a219 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
@@ -285,7 +285,7 @@ class SelectorThread extends Thread
                 {
                     unregisteredConnection.getSocketChannel().register(_selector, ops, unregisteredConnection);
                 }
-                catch (ClosedChannelException e)
+                catch (ClosedChannelException | CancelledKeyException e)
                 {
                     unregisterableConnections.add(unregisteredConnection);
                 }
@@ -503,7 +503,7 @@ class SelectorThread extends Thread
                     {
                         selectionKey = socketChannel.register(_selectionTasks[0].getSelector(),
0);
                     }
-                    catch (ClosedChannelException e)
+                    catch (ClosedChannelException | CancelledKeyException e)
                     {
                         LOGGER.error("Failed to deregister selector on accepting port {}",
                                      socketChannel.socket().getLocalSocketAddress(), e);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message