[1/3] git commit: Merge branch 'cassandra-1.1' into trunk

[yukim]

Updated Branches:
  refs/heads/cassandra-1.1 b0342978a -> 6e1f3a019
  refs/heads/trunk aff58e8ee -> 39fdebfd4


Merge branch 'cassandra-1.1' into trunk

Conflicts:
        src/java/org/apache/cassandra/db/Directories.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39fdebfd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39fdebfd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39fdebfd

Branch: refs/heads/trunk
Commit: 39fdebfd4917c40647c5f7db834d351d235562a0
Parents: aff58e8 6e1f3a0
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 30 13:59:58 2012 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 30 13:59:58 2012 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/Directories.java |   54 ++++++++++-----
 1 files changed, 36 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/39fdebfd/src/java/org/apache/cassandra/db/Directories.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/Directories.java
index 895f931,7ee2823..714b363
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@@ -532,21 -473,29 +532,29 @@@ public class Directorie
      {
          logger.info("Upgrade from pre-1.1 version detected: migrating 
sstables to new directory layout");
  
 -        for (File location : dataFileLocations)
 +        for (DataDirectory dir : dataFileLocations)
          {
 -            if (!location.exists() || !location.isDirectory())
 +            if (!dir.location.exists() || !dir.location.isDirectory())
                  continue;
  
-             for (File ksDir : dir.location.listFiles())
 -            File[] ksDirs = location.listFiles();
++            File[] ksDirs = dir.location.listFiles();
+             if (ksDirs != null)
              {
-                 if (!ksDir.isDirectory())
-                     continue;
+                 for (File ksDir : ksDirs)
+                 {
+                     if (!ksDir.isDirectory())
+                         continue;
  
-                 for (File file : ksDir.listFiles())
-                     migrateFile(file, ksDir, null);
+                     File[] files = ksDir.listFiles();
+                     if (files != null)
+                     {
+                         for (File file : files)
+                             migrateFile(file, ksDir, null);
+                     }
  
-                 migrateSnapshots(ksDir);
-                 migrateBackups(ksDir);
+                     migrateSnapshots(ksDir);
+                     migrateBackups(ksDir);
+                 }
              }
          }
      }