put hyphen check back when loading CF definitions. CASSANDRA-1377

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.6@988539 13f79535-47bb-0310-9956-ffa450edef68
apache · Aug 24, 2010 · 0caf009 · 0caf009
1 parent fd64ce5
commit 0caf009
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -669,6 +669,10 @@ private static void readTablesFromXml() throws ConfigurationException
                     {
                         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