svn commit: r1057655 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/config/CFMetaData.java

[jbellis]

Author: jbellis
Date: Tue Jan 11 14:23:46 2011
New Revision: 1057655

URL: http://svn.apache.org/viewvc?rev=1057655&view=rev
Log:
fix CFMetaData.applyto onlycompareobjectsof the same class
patch by Stu Hood; reviewed by slebresne for CASSANDRA-1962

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1057655&r1=1057654&r2=1057655&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Tue Jan 11 14:23:46 2011
@@ -15,6 +15,8 @@
  * distributed test harness (CASSANDRA-1859)
  * reduce flush lock contention (CASSANDRA-1930)
  * optimize supercolumn deserialization (CASSANDRA-1891)
+ * fix CFMetaData.apply to only compare objects of the same class 
+   (CASSANDRA-1962)
 
 
 0.7.0-dev

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1057655&r1=1057654&r2=1057655&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
 Tue Jan 11 14:23:46 2011
@@ -628,11 +628,11 @@ public final class CFMetaData
         // validate
         if (!cf_def.id.equals(cfId))
             throw new ConfigurationException("ids do not match.");
-        if (!cf_def.keyspace.equals(tableName))
+        if (!cf_def.keyspace.toString().equals(tableName))
             throw new ConfigurationException("keyspaces do not match.");
-        if (!cf_def.name.equals(cfName))
+        if (!cf_def.name.toString().equals(cfName))
             throw new ConfigurationException("names do not match.");
-        if (!cf_def.column_type.equals(cfType.name()))
+        if (!cf_def.column_type.toString().equals(cfType.name()))
             throw new ConfigurationException("types do not match.");
         if (comparator != 
DatabaseDescriptor.getComparator(cf_def.comparator_type))
             throw new ConfigurationException("comparators do not match.");