Merge pull request kubernetes#5808 from mikeln/issue-5737

Cassandra Cluster Example Add Check for Null Endpoints (redo2)
duda · Mar 24, 2015 · 9707a94 · 9707a94
2 parents aee9bdd + bbca721
commit 9707a94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/examples/cassandra/README.md b/examples/cassandra/README.md
@@ -295,10 +295,13 @@ public class KubernetesSeedProvider implements SeedProvider {
 	    ObjectMapper mapper = new ObjectMapper();
 	    Endpoints endpoints = mapper.readValue(url, Endpoints.class);
 	    if (endpoints != null) {
+            // Here is a problem point, endpoints.endpoints can be null in first node cases.
+            if (endpoints.endpoints != null){
 		for (String endpoint : endpoints.endpoints) {
 		    String[] parts = endpoint.split(":");
 		    list.add(InetAddress.getByName(parts[0]));
 		}
+            }
 	    }
         } catch (IOException ex) {
 	    logger.warn("Request to kubernetes apiserver failed"); 

diff --git a/examples/cassandra/java/io/k8s/cassandra/KubernetesSeedProvider.java b/examples/cassandra/java/io/k8s/cassandra/KubernetesSeedProvider.java
@@ -70,10 +70,13 @@ public List<InetAddress> getSeeds() {
 	    ObjectMapper mapper = new ObjectMapper();
 	    Endpoints endpoints = mapper.readValue(url, Endpoints.class);
 	    if (endpoints != null) {
+            // Here is a problem point, endpoints.endpoints can be null in first node cases.
+            if (endpoints.endpoints != null){
 		for (String endpoint : endpoints.endpoints) {
 		    String[] parts = endpoint.split(":");
 		    list.add(InetAddress.getByName(parts[0]));
 		}
+            }
 	    }
         } catch (IOException ex) {
 	    logger.warn("Request to kubernetes apiserver failed");