From 45e6d912cca3de66a3af02e9df2c3484992d0a2e Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Mon, 6 May 2013 09:07:31 +0200
Subject: [PATCH] Fix repair hanging silently on an unexpected error

patch by yukim; reviewed by slebresne for CASSANDRA-5229
---
 CHANGES.txt                                                 | 1 +
 .../apache/cassandra/streaming/IncomingStreamReader.java    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 4376a2538af5..4bdfb912f3b5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,7 @@
    (CASSANDRA-5531)
  * cqlsh: add CLUSTERING ORDER BY support to DESCRIBE (CASSANDRA-5528)
  * Add custom secondary index support to CQL3 (CASSANDRA-5484)
+ * Fix repair hanging silently on unexpected error (CASSANDRA-5229)
 Merged from 1.1
  * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
  * Use allocator information to improve memtable memory usage estimate
diff --git a/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java b/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
index 8036afdcee9e..0b058fc72bac 100644
--- a/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
+++ b/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
@@ -127,6 +127,12 @@ public void read() throws IOException
                 retry();
                 throw ex;
             }
+            catch (RuntimeException e)
+            {
+                // if we encountered unexpected exception, fail this session
+                session.close(false);
+                throw e;
+            }
         }
 
         session.closeIfFinished();