natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix npe if configURL is null (new URL(null) throws)

This commit is contained in:
Dave Brosius 2014-05-03 16:39:16 -04:00
parent 3047ab6387
commit 3fb2dcdf06
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/org/apache/cassandra/locator/SnitchProperties.java
View File

@ -38,9 +38,12 @@ public class SnitchProperties
String configURL = System.getProperty(RACKDC_PROPERTY_FILENAME); String configURL = System.getProperty(RACKDC_PROPERTY_FILENAME);
try try
{ {
URL url = new URL(configURL); URL url;
if (configURL == null) if (configURL == null)
url = SnitchProperties.class.getClassLoader().getResource(RACKDC_PROPERTY_FILENAME); url = SnitchProperties.class.getClassLoader().getResource(RACKDC_PROPERTY_FILENAME);
else
url = new URL(configURL);
stream = url.openStream(); // catch block handles potential NPE stream = url.openStream(); // catch block handles potential NPE
properties.load(stream); properties.load(stream);
} }