svn commit: r1062843 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java

[jb...@apache.org]

Author: jbellis
Date: Mon Jan 24 15:53:13 2011
New Revision: 1062843

URL: http://svn.apache.org/viewvc?rev=1062843&view=rev
Log:
load PFS properties with ResourceAsStream
patch by Michael SembWever; reviewed by jbellis for CASSANDRA-2036

Modified:
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java?rev=1062843&r1=1062842&r2=1062843&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java Mon Jan 24 15:53:13 2011
@@ -18,10 +18,8 @@
 
 package org.apache.cassandra.locator;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
 import java.io.IOException;
-import java.io.Reader;
+import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.HashMap;
@@ -113,13 +111,12 @@ public class PropertyFileSnitch extends 
     {
         HashMap<InetAddress, String[]> reloadedMap = new HashMap<InetAddress, String[]>();
 
-        String rackPropertyFilename = FBUtilities.resourceToFile(RACK_PROPERTY_FILENAME);
         Properties properties = new Properties();
-        Reader reader = null;
+        InputStream stream = null;
         try
         {
-            reader = new BufferedReader(new FileReader(rackPropertyFilename));
-            properties.load(reader);
+            stream = getClass().getClassLoader().getResourceAsStream(RACK_PROPERTY_FILENAME);
+            properties.load(stream);
         }
         catch (IOException e)
         {
@@ -127,7 +124,7 @@ public class PropertyFileSnitch extends 
         }
         finally
         {
-            FileUtils.closeQuietly(reader);
+            FileUtils.closeQuietly(stream);
         }
 
         for (Map.Entry<Object, Object> entry : properties.entrySet())