Updated Branches: refs/heads/trunk 2b86c9a4f -> 093e188a4
Suppress custom exceptions thru jmx patch by dbrosius reviewed by slebresne for cassandra 5652 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f30015c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f30015c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f30015c8 Branch: refs/heads/trunk Commit: f30015c862eb913d1f0cf8c10d201de5698a6dda Parents: f1004e9 Author: Dave Brosius <dbros...@apache.org> Authored: Tue Jun 18 08:44:28 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Tue Jun 18 08:44:28 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f30015c8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 2bba0ee..65f66de 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -26,6 +26,7 @@ * fix help text for -tspw cassandra-cli (CASSANDRA-5643) * don't throw away initial causes exceptions for internode encryption issues (CASSANDRA-5644) * Fix message spelling errors for cql select statements (CASSANDRA-5647) + * Suppress custom exceptions thru jmx (CASSANDRA-5652) Merged from 1.1: * Remove buggy thrift max message length option (CASSANDRA-5529) * Fix NPE in Pig's widerow mode (CASSANDRA-5488) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f30015c8/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 9f22318..49db272 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -336,7 +336,15 @@ public class StorageService extends NotificationBroadcasterSupport implements IE { throw new IllegalStateException("No configured daemon"); } - daemon.nativeServer.start(); + + try + { + daemon.nativeServer.start(); + } + catch (Exception e) + { + throw new RuntimeException("Error starting native transport: " + e.getMessage()); + } } public void stopNativeTransport()