svn commit: r942069 - /cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

[gdusbabek]

Author: gdusbabek
Date: Fri May  7 13:40:00 2010
New Revision: 942069

URL: http://svn.apache.org/viewvc?rev=942069&view=rev
Log:
ignore subdirectories (snapshots) within a keyspace directory when scanning for 
files. Patch by Paul Bohm, reviewed by Gary Dusbabek. CASSANDRA-983

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=942069&r1=942068&r2=942069&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Fri 
May  7 13:40:00 2010
@@ -245,6 +245,8 @@ public class ColumnFamilyStore implement
             
             for (File file : files)
             {
+                if (file.isDirectory())
+                    continue;
                 String filename = file.getAbsolutePath();
                 String cfName = getColumnFamilyFromFileName(filename);
 
@@ -283,6 +285,8 @@ public class ColumnFamilyStore implement
             File[] files = new File(directory).listFiles();
             for (File file : files)
             {
+                if (file.isDirectory())
+                    continue;
                 String cfName = 
getColumnFamilyFromFileName(file.getAbsolutePath());
                 if (cfName.equals(columnFamily_))
                     fileSet.add(file);