svn commit: r1039129 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/utils/FBUtilities.java

[jb...@apache.org]

Author: jbellis
Date: Thu Nov 25 18:26:25 2010
New Revision: 1039129

URL: http://svn.apache.org/viewvc?rev=1039129&view=rev
Log:
use local classloader instead of system one to check for version.properties
patch by Bram de Kruijff; reviewed by jbellis for CASSANDRA-1778

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1039129&r1=1039128&r2=1039129&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Thu Nov 25 18:26:25 2010
@@ -13,6 +13,7 @@ dev
  * support multiple Mutations per key in hadoop ColumnFamilyOutputFormat
    (CASSANDRA-1774)
  * improvements to Debian init script (CASSANDRA-1772)
+ * use local classloader to check for version.properties (CASSANDRA-1778)
 
 
 0.7.0-rc1

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java?rev=1039129&r1=1039128&r2=1039129&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/utils/FBUtilities.java Thu Nov 25 18:26:25 2010
@@ -517,7 +517,7 @@ public class FBUtilities
     {
         try
         {
-            InputStream in = ClassLoader.getSystemClassLoader().getResourceAsStream("org/apache/cassandra/config/version.properties");
+            InputStream in = FBUtilities.class.getClassLoader().getResourceAsStream("org/apache/cassandra/config/version.properties");
             Properties props = new Properties();
             props.load(in);
             return props.getProperty("CassandraVersion");