svn commit: r979689 - in /cassandra/trunk: src/java/org/apache/cassandra/io/sstable/Descriptor.java test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java

[gd...@apache.org]

Author: gdusbabek
Date: Tue Jul 27 13:24:20 2010
New Revision: 979689

URL: http://svn.apache.org/viewvc?rev=979689&view=rev
Log:
LegacySSTableTest should ignore invalid directories. patch by stuhood, reviewed by gdusbabek

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/io/sstable/Descriptor.java
    cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/io/sstable/Descriptor.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/Descriptor.java?rev=979689&r1=979688&r2=979689&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/sstable/Descriptor.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/sstable/Descriptor.java Tue Jul 27 13:24:20 2010
@@ -128,7 +128,7 @@ public class Descriptor
      * @return True if the given version string is not empty, and
      * contains all lowercase letters, as defined by java.lang.Character.
      */
-    private static boolean versionValidate(String ver)
+    static boolean versionValidate(String ver)
     {
         if (ver.length() < 1) return false;
         for (char ch : ver.toCharArray())

Modified: cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java?rev=979689&r1=979688&r2=979689&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java Tue Jul 27 13:24:20 2010
@@ -92,7 +92,8 @@ public class LegacySSTableTest extends C
     public void testVersions() throws IOException
     {
         for (File version : LEGACY_SSTABLE_ROOT.listFiles())
-            testVersion(version.getName());
+            if (Descriptor.versionValidate(version.getName()))
+                testVersion(version.getName());
     }
 
     public void testVersion(String version)