Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Jason Brown 2014-10-14 06:58:46 -07:00
commit b76dc97274
1 changed files with 8 additions and 5 deletions

View File

@ -82,14 +82,17 @@ public class CommitLogArchiver
archiveCommand = commitlog_commands.getProperty("archive_command");
restoreCommand = commitlog_commands.getProperty("restore_command");
restoreDirectories = commitlog_commands.getProperty("restore_directories");
for (String dir : restoreDirectories.split(DELIMITER))
if (restoreDirectories != null && !restoreDirectories.isEmpty())
{
File directory = new File(dir);
if (!directory.exists())
for (String dir : restoreDirectories.split(DELIMITER))
{
if (!directory.mkdir())
File directory = new File(dir);
if (!directory.exists())
{
throw new RuntimeException("Unable to create directory " + dir);
if (!directory.mkdir())
{
throw new RuntimeException("Unable to create directory: " + dir);
}
}
}
}