cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1127169 - /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
Date Tue, 24 May 2011 17:37:09 GMT
Author: jbellis
Date: Tue May 24 17:37:08 2011
New Revision: 1127169

URL: http://svn.apache.org/viewvc?rev=1127169&view=rev
Log:
fix bad merge

Modified:
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java

Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1127169&r1=1127168&r2=1127169&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
(original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
Tue May 24 17:37:08 2011
@@ -669,7 +669,7 @@ public final class CFMetaData
         // validate
         if (!cf_def.keyspace.toString().equals(ksName))
             throw new ConfigurationException(String.format("Keyspace mismatch (found %s;
expected %s)",
-                                                           cf_def.keyspace, tableName));
+                                                           cf_def.keyspace, ksName));
         if (!cf_def.name.toString().equals(cfName))
             throw new ConfigurationException(String.format("Column family mismatch (found
%s; expected %s)",
                                                            cf_def.name, cfName));



Mime
View raw message