commit dfa59e372ef00545ff1c8e1aed8da1c002fd6db8
author Ashley Winters <ashley.winters@freedomvoice.com> Fri Jul 26 10:50:28 2013 -0500
committer Yuki Morishita <yukim@apache.org> Fri Jul 26 10:50:28 2013 -0500
tree 23b91509e9a279a8d52700f2957e1420e4b849bf
parent 1810af404c85b2b63b99483b1dcb26cf5121aaac

Retry important messages for any IOException

patch by Ashley Winters; reveiewed by yukim for CASSANDRA-5804

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index 858bbf8..077a986 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 1.2.8
  * cqlsh: add collections support to COPY (CASSANDRA-5698)
+ * retry important messages for any IOException (CASSANDRA-5804)
 
 
 1.2.7

src/java/org/apache/cassandra/net/OutboundTcpConnection.java

diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 648123b..4edac5d 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -215,7 +215,7 @@
 
                 // if the message was important, such as a repair acknowledgement, put it back on the queue
                 // to retry after re-connecting.  See CASSANDRA-5393
-                if (e instanceof SocketException && qm.shouldRetry())
+                if (qm.shouldRetry())
                 {
                     try
                     {