svn commit: r1161189 - /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java

[brandonwilliams]

Author: brandonwilliams
Date: Wed Aug 24 16:11:19 2011
New Revision: 1161189

URL: http://svn.apache.org/viewvc?rev=1161189&view=rev
Log:
Fix NPE in describe_ring with a mixed cluster.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-3032

Modified:
    
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java?rev=1161189&r1=1161188&r2=1161189&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
 Wed Aug 24 16:11:19 2011
@@ -619,6 +619,8 @@ public class StorageService implements I
             {
                 if (endpoint.equals(FBUtilities.getLocalAddress()))
                     
rpcaddrs.add(DatabaseDescriptor.getRpcAddress().getHostAddress());
+                else if 
(Gossiper.instance.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.RPC_ADDRESS)
 == null)
+                    rpcaddrs.add(endpoint.getHostAddress());
                 else
                     
rpcaddrs.add(Gossiper.instance.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.RPC_ADDRESS).value);
             }