You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2020/09/23 15:06:56 UTC
[cassandra] branch cassandra-2.2 updated: Fix
ExceptionInInitializerError when data_file_directories is not set
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-2.2
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-2.2 by this push:
new ed80055 Fix ExceptionInInitializerError when data_file_directories is not set
ed80055 is described below
commit ed8005552376188abb81894fb8c9c611ebd6379a
Author: Erick Ramirez <fl...@gmail.com>
AuthorDate: Wed Sep 23 21:14:54 2020 +1000
Fix ExceptionInInitializerError when data_file_directories is not set
Patch by Erick Ramirez, reviewed by brandonwilliams for CASSANDRA-16008
---
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 9cccd7c..73e9ba9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.19
+ * Fix ExceptionInInitializerError when data_file_directories is not set (CASSANDRA-16008)
2.2.18
* Fix CQL parsing of collections when the column type is reversed (CASSANDRA-15814)
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 41a09e9..1c37459 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -561,7 +561,7 @@ public class DatabaseDescriptor
throw new ConfigurationException("saved_caches_directory is missing and -Dcassandra.storagedir is not set", false);
conf.saved_caches_directory += File.separator + "saved_caches";
}
- if (conf.data_file_directories == null)
+ if (conf.data_file_directories == null || conf.data_file_directories.length == 0)
{
String defaultDataDir = System.getProperty("cassandra.storagedir", null);
if (defaultDataDir == null)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org