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

Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Jason Brown 2014-10-14 06:58:46 -07:00
parent 4b7161da4a cc8eeefe88
commit b76dc97274
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
View File

@ -82,14 +82,17 @@ public class CommitLogArchiver
archiveCommand = commitlog_commands.getProperty("archive_command"); archiveCommand = commitlog_commands.getProperty("archive_command");
restoreCommand = commitlog_commands.getProperty("restore_command"); restoreCommand = commitlog_commands.getProperty("restore_command");
restoreDirectories = commitlog_commands.getProperty("restore_directories"); restoreDirectories = commitlog_commands.getProperty("restore_directories");
for (String dir : restoreDirectories.split(DELIMITER)) if (restoreDirectories != null && !restoreDirectories.isEmpty())
{ {
File directory = new File(dir); for (String dir : restoreDirectories.split(DELIMITER))
if (!directory.exists())
{ {
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);
}
} }
} }
} }