[Carbon-commits] [Carbon] svn commit r92607 - trunk/carbon/dependencies/hector/core/src/main/java/me/prettyprint/cassandra/connection

[indika at wso2.com]

Author: indika
Date: Tue Apr 26 11:37:36 2011
New Revision: 92607
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=92607

Log:
fix an issue occurred with nodeautodiscovery (hector) when a keyspace is null or empty 

Modified:
   trunk/carbon/dependencies/hector/core/src/main/java/me/prettyprint/cassandra/connection/NodeAutoDiscoverService.java

Modified: trunk/carbon/dependencies/hector/core/src/main/java/me/prettyprint/cassandra/connection/NodeAutoDiscoverService.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/dependencies/hector/core/src/main/java/me/prettyprint/cassandra/connection/NodeAutoDiscoverService.java?rev=92607&r1=92606&r2=92607&view=diff
==============================================================================
--- trunk/carbon/dependencies/hector/core/src/main/java/me/prettyprint/cassandra/connection/NodeAutoDiscoverService.java	(original)
+++ trunk/carbon/dependencies/hector/core/src/main/java/me/prettyprint/cassandra/connection/NodeAutoDiscoverService.java	Tue Apr 26 11:37:36 2011
@@ -88,23 +88,34 @@
         }
         if (keyspaces != null) {
             for (KeyspaceDefinition keyspace : keyspaces) {
-                if (!keyspace.getName().equals(Keyspace.KEYSPACE_SYSTEM)) {
-                    try {
-                        List<TokenRange> tokenRanges = cluster.describeRing(keyspace.getName());
-                        for (TokenRange tokenRange : tokenRanges) {
-                            for (String host : tokenRange.getEndpoints()) {
-                                CassandraHost foundHost = new CassandraHost(host, cassandraHostConfigurator.getPort());
-                                if (!existingHosts.contains(foundHost)) {
-                                    log.info("Found a node we don't know about {} for TokenRange {}", foundHost, tokenRange);
-                                    foundHosts.add(foundHost);
+                String keyspaceName = keyspace.getName();
+                if (keyspaceName == null || "".equals(keyspaceName)) {
+                    if (log.isDebugEnabled()) {
+                        log.debug("Returned a keyspace with a name as null value or empty");
+                    }
+                    continue;
+                }
+                if (Keyspace.KEYSPACE_SYSTEM.equals(keyspace)) {
+                    continue;
+                }
+                try {
+                    List<TokenRange> tokenRanges = cluster.describeRing(keyspaceName);
+                    for (TokenRange tokenRange : tokenRanges) {
+                        for (String host : tokenRange.getEndpoints()) {
+                            CassandraHost foundHost = new CassandraHost(host, cassandraHostConfigurator.getPort());
+                            if (!existingHosts.contains(foundHost)) {
+                                if (log.isDebugEnabled()) {
+                                    log.debug("Found a node we don't know about {} for TokenRange {}", foundHost, tokenRange);
                                 }
+                                foundHosts.add(foundHost);
                             }
                         }
-                    } catch (Exception e) {
-                        log.error("Error getting nodes list for keyspace : " + keyspace, e);
                     }
-                    break;
+                } catch (Exception e) {
+                    log.error("Error getting nodes list for keyspace : " + keyspaceName, e);
                 }
+                break;
+
             }
         }
         return foundHosts;