You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by vi...@apache.org on 2012/02/14 19:52:14 UTC

[23/50] git commit: CASSANDRA-3867 patch by Vijay; reviewed by Brandon Williams for CASSANDRA-3867

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/c49a1497
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c49a1497
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c49a1497

Branch: refs/heads/cassandra-1.0
Commit: c49a1497eafc5ab5c16b03b3f97842c5ab1e64c8
Parents: 232da82
Author: Vijay Parthasarathy <vi...@gmail.com>
Authored: Mon Feb 13 12:37:22 2012 -0800
Committer: Vijay Parthasarathy <vi...@gmail.com>
Committed: Mon Feb 13 12:37:22 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/c49a1497/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)
             {