svn commit: r1163759 - /cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java

[jbellis]

Author: jbellis
Date: Wed Aug 31 19:31:39 2011
New Revision: 1163759

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

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java?rev=1163759&r1=1163758&r2=1163759&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java 
Wed Aug 31 19:31:39 2011
@@ -725,7 +725,7 @@ public class ThriftValidation
         // keyspace names must be unique case-insensitively because the 
keyspace name becomes the directory
         // where we store CF sstables.  Names that differ only in case would 
thus cause problems on
         // case-insensitive filesystems (NTFS, most installations of HFS+).
-        for (String ksName : DatabaseDescriptor.getTables())
+        for (String ksName : Schema.instance.getTables())
         {
             if (ksName.equalsIgnoreCase(newKsName))
                 throw new InvalidRequestException("Keyspace names must be 
case-insensitively unique");