svn commit: r1078108 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/NodeCmd.java

[brandonwilliams]

Author: brandonwilliams
Date: Fri Mar  4 19:22:37 2011
New Revision: 1078108

URL: http://svn.apache.org/viewvc?rev=1078108&view=rev
Log:
Fix NPE in nodetool when gossip isn't initialized.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-2270

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/NodeCmd.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/NodeCmd.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/NodeCmd.java?rev=1078108&r1=1078107&r2=1078108&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/NodeCmd.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/NodeCmd.java
 Fri Mar  4 19:22:37 2011
@@ -209,11 +209,15 @@ public class NodeCmd
      */
     public void printInfo(PrintStream outs)
     {
+        boolean gossipInitialized = probe.isInitialized();
         outs.println(probe.getToken());
-        outs.printf("%-17s: %s%n", "Gossip active", probe.isInitialized());
+        outs.printf("%-17s: %s%n", "Gossip active", gossipInitialized);
         outs.printf("%-17s: %s%n", "Load", probe.getLoadString());
-        outs.printf("%-17s: %s%n", "Generation No", 
probe.getCurrentGenerationNumber());
-        
+        if (gossipInitialized)
+            outs.printf("%-17s: %s%n", "Generation No", 
probe.getCurrentGenerationNumber());
+        else
+            outs.printf("%-17s: %s%n", "Generation No", 0);
+
         // Uptime
         long secondsUp = probe.getUptime() / 1000;
         outs.printf("%-17s: %d%n", "Uptime (seconds)", secondsUp);