From 3fb2dcdf06fa74db14891abb76a447c040f32436 Mon Sep 17 00:00:00 2001
From: Dave Brosius <dbrosius@mebigfatguy.com>
Date: Sat, 3 May 2014 16:39:16 -0400
Subject: [PATCH] fix npe if configURL is null (new URL(null) throws)

---
 src/java/org/apache/cassandra/locator/SnitchProperties.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java b/src/java/org/apache/cassandra/locator/SnitchProperties.java
index 52268da257..36fec7f36d 100644
--- a/src/java/org/apache/cassandra/locator/SnitchProperties.java
+++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java
@@ -38,9 +38,12 @@ public class SnitchProperties
         String configURL = System.getProperty(RACKDC_PROPERTY_FILENAME);
         try
         {
-            URL url = new URL(configURL);
+            URL url;
             if (configURL == null)
                 url = SnitchProperties.class.getClassLoader().getResource(RACKDC_PROPERTY_FILENAME);
+            else 
+            	url = new URL(configURL);
+            
             stream = url.openStream(); // catch block handles potential NPE
             properties.load(stream);
         }