Merge pull request kubernetes#343 from ZP-AlwaysWin/dev01

fix to prevent null pointer exceptions
philipwu08 · Sep 19, 2019 · 7c24236 · 7c24236
2 parents f714111 + 2ef4b3a
commit 7c24236
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/cassandra/java/src/main/java/io/k8s/cassandra/KubernetesSeedProvider.java b/cassandra/java/src/main/java/io/k8s/cassandra/KubernetesSeedProvider.java
@@ -67,7 +67,8 @@ public List<InetAddress> getSeeds() {
 		String namespace = getEnvOrDefault("POD_NAMESPACE", "default");
 
 		String initialSeeds = getEnvOrDefault("CASSANDRA_SEEDS", "");
-		if (initialSeeds.equals("")) {
+
+		if ("".equals(initialSeeds)) {
 			initialSeeds = getEnvOrDefault("POD_IP", "");
 		}
 
@@ -79,11 +80,11 @@ public List<InetAddress> getSeeds() {
 
 		try {
 			Endpoints endpoints = mapper.readValue(data, Endpoints.class);
-			logger.info("cassandra seeds: " + endpoints.ips.toString());
+			logger.info("cassandra seeds: {}", endpoints.ips.toString());
 			return Collections.unmodifiableList(endpoints.ips);
 		} catch (IOException e) {
 			// This should not happen
-			logger.error("unexpected error building cassandra seeds: " + e.getMessage());
+			logger.error("unexpected error building cassandra seeds: {}" , e.getMessage());
 			return Collections.emptyList();
 		}
 	}