Updated Branches: refs/heads/cassandra-1.0 4bd3f8d86 -> 2a5547981
CASSANDRA-3867 patch by Vijay; reviewed by Brandon Williams for CASSANDRA-3867 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a554798 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a554798 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a554798 Branch: refs/heads/cassandra-1.0 Commit: 2a5547981dad7e59be2c26aeb52f5d49d2195b9c Parents: 4bd3f8d Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Mon Feb 13 12:42:29 2012 -0800 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Mon Feb 13 12:42:29 2012 -0800 ---------------------------------------------------------------------- .../apache/cassandra/thrift/CustomTHsHaServer.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2a554798/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 4921678..9bfb4f7 100644 --- a/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java +++ b/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java @@ -177,6 +177,14 @@ public class CustomTHsHaServer extends TNonblockingServer { select(); } + try + { + selector.close(); // CASSANDRA-3867 + } + catch (IOException e) + { + // ignore this exception. + } } catch (Throwable t) {
