Repository: cassandra Updated Branches: refs/heads/trunk 25821864f -> 189124091
ninja fix to add null check on CommitLogArchiver startup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc8eeefe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc8eeefe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc8eeefe Branch: refs/heads/trunk Commit: cc8eeefe8895e01a2a5f387788bb3772b4dabbc9 Parents: d828643 Author: Jason Brown <[email protected]> Authored: Tue Oct 14 06:57:52 2014 -0700 Committer: Jason Brown <[email protected]> Committed: Tue Oct 14 06:57:52 2014 -0700 ---------------------------------------------------------------------- .../cassandra/db/commitlog/CommitLogArchiver.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc8eeefe/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java index e30443e..8957643 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java @@ -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); + } } } }
