merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6895bd62 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6895bd62 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6895bd62 Branch: refs/heads/trunk Commit: 6895bd6278d6578f9c727dc3a7b5bd07080645c2 Parents: aadc5e5 712d468 Author: Jonathan Ellis <[email protected]> Authored: Thu Mar 7 15:26:59 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Thu Mar 7 15:27:31 2013 -0600 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6895bd62/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 2ad41ab,afcfb42..dec3773 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@@ -38,9 -36,8 +38,10 @@@ import org.apache.cassandra.config.Encr import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DefsTable; import org.apache.cassandra.db.SystemTable; + import org.apache.cassandra.db.Table; import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.locator.DynamicEndpointSnitch; import org.apache.cassandra.locator.EndpointSnitchInfo; @@@ -582,7 -551,7 +583,7 @@@ public class DatabaseDescripto { public boolean accept(File pathname) { - return (pathname.isDirectory() && !Table.SYSTEM_KS.equals(pathname.getName())); - return (pathname.isDirectory() && !Table.SYSTEM_TABLE.equals(pathname.getName())); ++ return (pathname.isDirectory() && !Schema.systemKeyspaceNames.contains(pathname.getName())); } }).length;
