cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdusba...@apache.org
Subject svn commit: r988539 - /cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Date Tue, 24 Aug 2010 13:38:38 GMT
Author: gdusbabek
Date: Tue Aug 24 13:38:37 2010
New Revision: 988539

URL: http://svn.apache.org/viewvc?rev=988539&view=rev
Log:
put hyphen check back when loading CF definitions. CASSANDRA-1377

Modified:
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java

Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=988539&r1=988538&r2=988539&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Tue Aug 24 13:38:37 2010
@@ -669,6 +669,10 @@ public class DatabaseDescriptor
                     {
                         throw new ConfigurationException("ColumnFamily name attribute is
required");
                     }
+                    if (cfName.contains("-"))
+                    {
+                        throw new ConfigurationException("ColumnFamily names cannot contain
hyphens");
+                    }
                     String xqlCF = xqlTable + "ColumnFamily[@Name='" + cfName + "']/";
 
                     // Parse out the column type



Mime
View raw message