From 5a658be5ed3339b7dc52084d7eb33dd8295fa9f3 Mon Sep 17 00:00:00 2001
From: Sylvain Lebresne <sylvain@datastax.com>
Date: Wed, 2 Jul 2014 11:41:06 +0200
Subject: [PATCH 1/2] Versions update for 1.2.18

---
 NEWS.txt         | 9 +++++++++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/NEWS.txt b/NEWS.txt
index 97d32f2381..d2d1fa5098 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,15 @@ restore snapshots created with the previous major version using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
+1.2.18
+======
+
+Upgrading
+---------
+    - Nothing specific to this release, but please see 1.2.17 if you are upgrading
+      from a previous version.
+
+
 1.2.17
 ======
 
diff --git a/build.xml b/build.xml
index 1310d6432f..94d3e2ddf3 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="1.2.17"/>
+    <property name="base.version" value="1.2.18"/>
     <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
     <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --git a/debian/changelog b/debian/changelog
index adb7a37046..e80e45e4a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.18) unstable; urgency=medium
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Wed, 02 Jul 2014 10:55:12 +0200
+
 cassandra (1.2.17) unstable; urgency=medium
 
   * New release

From 0d90b03a30247ae8a1cf2977467de1972b36f9dd Mon Sep 17 00:00:00 2001
From: Tyler Hobbs <tyler@datastax.com>
Date: Thu, 10 Jul 2014 16:11:20 -0500
Subject: [PATCH 2/2] Set stream ID on response for non-Exception Throwables

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7470
---
 CHANGES.txt                                          | 4 ++++
 src/java/org/apache/cassandra/transport/Message.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1a79e8d149..2951fed6a2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.2.19
+ * Set correct stream ID on responses when non-Exception Throwables
+   are thrown while handling native protocol messages (CASSANDRA-7470)
+
 1.2.18
  * Support Thrift tables clustering columns on CqlPagingInputFormat (CASSANDRA-7445)
  * Fix compilation with java 6 broke by CASSANDRA-7147
diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java
index 5cc399891d..74aaad1795 100644
--- a/src/java/org/apache/cassandra/transport/Message.java
+++ b/src/java/org/apache/cassandra/transport/Message.java
@@ -293,7 +293,7 @@ public abstract class Message
 
                 ctx.getChannel().write(response);
             }
-            catch (Exception ex)
+            catch (Throwable ex)
             {
                 // Don't let the exception propagate to exceptionCaught() if we can help it so that we can assign the right streamID.
                 ctx.getChannel().write(ErrorMessage.fromException(ex).setStreamId(request.getStreamId()));