Repository: cassandra
Updated Branches:
  refs/heads/trunk d5e400dfe -> 87fdc9b66


Change token validation of Murmur3Partitioner to display a helpful error 
message if the token is invalid

patch by verma7; reviewed by slebresne for CASSANDRA-9348


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87fdc9b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87fdc9b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87fdc9b6

Branch: refs/heads/trunk
Commit: 87fdc9b667d68602ccb9d0ef27233d801b600cae
Parents: d5e400d
Author: Abhishek Verma <ve...@uber.com>
Authored: Tue Mar 22 14:18:28 2016 -0700
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Tue Apr 5 17:47:42 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/dht/Murmur3Partitioner.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/87fdc9b6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5c6bdb5..f30210a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.6
+ * More user friendly error when providing an invalid token to nodetool 
(CASSANDRA-9348)
  * Add static column support to SASI index (CASSANDRA-11183)
  * Support EQ/PREFIX queries in SASI CONTAINS mode without tokenization 
(CASSANDRA-11434)
  * Support LIKE operator in prepared statements (CASSANDRA-11456)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/87fdc9b6/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java 
b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
index f9f6113..9ed0cca 100644
--- a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
+++ b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
@@ -278,7 +278,7 @@ public class Murmur3Partitioner implements IPartitioner
         {
             try
             {
-                Long.valueOf(token);
+                fromString(token);
             }
             catch (NumberFormatException e)
             {

Reply via email to