Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 3d81ac5ec -> 53c95ebf3
  refs/heads/cassandra-2.1 b9153f4ae -> 1e13cbf84
  refs/heads/trunk bafde3d66 -> 85956ae68


Don't output a stacktrace when removenode force is errantly called

Patch by Kirk True, reviewed by brandonwilliams for CASSANDRA-6397


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

Branch: refs/heads/cassandra-2.0
Commit: 53c95ebf3140ae846a48b1314ab86392966ed4ee
Parents: 3d81ac5
Author: Brandon Williams <[email protected]>
Authored: Thu Jun 12 17:32:31 2014 -0500
Committer: Brandon Williams <[email protected]>
Committed: Thu Jun 12 17:32:31 2014 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/53c95ebf/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 394b2a5..05cc8d7 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3339,7 +3339,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
         }
         else
         {
-            throw new UnsupportedOperationException("No tokens to force 
removal on, call 'removenode' first");
+            logger.warn("No tokens to force removal on, call 'removenode' 
first");
         }
     }
 

Reply via email to