Set stream ID on response for non-Exception Throwables Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7470
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d90b03a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d90b03a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d90b03a Branch: refs/heads/trunk Commit: 0d90b03a30247ae8a1cf2977467de1972b36f9dd Parents: 5a658be Author: Tyler Hobbs <ty...@datastax.com> Authored: Thu Jul 10 16:11:20 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Thu Jul 10 16:11:20 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ src/java/org/apache/cassandra/transport/Message.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d90b03a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1a79e8d..2951fed 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d90b03a/src/java/org/apache/cassandra/transport/Message.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java index 5cc3998..74aaad1 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()));