From cc8eeefe8895e01a2a5f387788bb3772b4dabbc9 Mon Sep 17 00:00:00 2001 From: Jason Brown Date: Tue, 14 Oct 2014 06:57:52 -0700 Subject: [PATCH] ninja fix to add null check on CommitLogArchiver startup --- .../cassandra/db/commitlog/CommitLogArchiver.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java index e30443eda7..89576431f6 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); + } } } }