Fix ExceptionInInitializerError when data_file_directories is not set

Patch by Erick Ramirez, reviewed by brandonwilliams for CASSANDRA-16008
apache · Sep 23, 2020 · ed80055 · ed80055
1 parent 2f0eb6f
commit ed80055
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -561,7 +561,7 @@ public int compare(InetAddress endpoint1, InetAddress endpoint2)
                 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)