Author: slebresne
Date: Thu Oct 27 13:16:53 2011
New Revision: 1189738
URL: http://svn.apache.org/viewvc?rev=1189738&view=rev
Log:
Fix cassandra handing on stop
patch by slebresne; reviewed by tjake for CASSANDRA-3302
Modified:
cassandra/branches/cassandra-1.0/CHANGES.txt
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1189738&r1=1189737&r2=1189738&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Thu Oct 27 13:16:53 2011
@@ -25,6 +25,7 @@
* use CF/KS names as snapshot prefix for drop + truncate operations
(CASSANDRA-2997)
* Break bloom filters up to avoid heap fragmentation (CASSANDRA-2466)
+ * fix cassandra hanging on jsvc stop (CASSANDRA-3302)
Merged from 0.8:
* (CQL) update grammar to require key clause in DELETE statement
(CASSANDRA-3349)
Modified:
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java?rev=1189738&r1=1189737&r2=1189738&view=diff
==============================================================================
---
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
(original)
+++
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java
Thu Oct 27 13:16:53 2011
@@ -174,4 +174,12 @@ public class TCustomServerSocket extends
serverSocket_ = null;
}
}
+
+ @Override
+ public void interrupt()
+ {
+ // The thread-safeness of this is dubious, but Java documentation
suggests
+ // that it is safe to do this from a different thread context
+ close();
+ }
}
