Cleanup selector's keys. patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-6546
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b573d0fb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b573d0fb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b573d0fb Branch: refs/heads/cassandra-2.1 Commit: b573d0fb51a91b053d11d5693eae5a397019d288 Parents: 1052749 Author: Mikhail Stepura <mish...@apache.org> Authored: Wed Apr 30 13:39:02 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Thu May 1 15:18:00 2014 -0700 ---------------------------------------------------------------------- src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b573d0fb/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java b/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java index 2e2287d..076652f 100644 --- a/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java +++ b/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java @@ -195,6 +195,11 @@ public class CustomTHsHaServer extends TNonblockingServer { try { + //CASSANDRA-6546 + for (SelectionKey key: selector.keys()) + { + cleanupSelectionkey(key); + } selector.close(); // CASSANDRA-3867 } catch (IOException e)