natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix DatabaseDescriptor.hasExistingNoSystemTables to skip system table correctly 

patch by Jackson Chung; reviewed by jbellis for CASSANDRA-5289
This commit is contained in:
Jonathan Ellis 2013-03-07 18:23:47 +00:00
parent ea08e01a09
commit 3a6125db87
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -1,4 +1,6 @@
1.1.11
* fix logging of "Found table data in data directories" when only system tables
are present (CASSANDRA-5289)
* cli: Add JMX authentication support (CASSANDRA-5080)
* nodetool: ability to repair specific range (CASSANDRA-5280)
* Fix possible assertion triggered in SliceFromReadCommand (CASSANDRA-5284)

2
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
View File

@ -550,7 +550,7 @@ public class DatabaseDescriptor
{
public boolean accept(File pathname)
{
return pathname.isDirectory();
return (pathname.isDirectory() && !Table.SYSTEM_KS.equals(pathname.getName()));
}
}).length;