diff --git a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java index 2be55fbe5c..be93b64680 100644 --- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java +++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java @@ -243,8 +243,6 @@ public enum CassandraRelevantProperties DTEST_IGNORE_SHUTDOWN_THREADCOUNT("jvm_dtests.ignore_shutdown_threadcount"), /** This property indicates if the code is running under the in-jvm dtest framework */ DTEST_IS_IN_JVM_DTEST("org.apache.cassandra.dtest.is_in_jvm_dtest"), - /** In_JVM dtest property indicating that the test should use "latest" configuration */ - DTEST_JVM_DTESTS_USE_LATEST("jvm_dtests.latest"), ENABLE_DC_LOCAL_COMMIT("cassandra.enable_dc_local_commit", "true"), /** * Whether {@link org.apache.cassandra.db.ConsistencyLevel#NODE_LOCAL} should be allowed. @@ -881,10 +879,10 @@ public enum CassandraRelevantProperties */ public int getInt() { - String value = System.getProperty(key); - if (value == null && defaultVal == null) + String value = System.getProperty(key, defaultVal); + if (value == null) throw new ConfigurationException("Missing property value or default value is not set: " + key); - return INTEGER_CONVERTER.convert(value == null ? defaultVal : value); + return INTEGER_CONVERTER.convert(value); } /** @@ -893,10 +891,10 @@ public enum CassandraRelevantProperties */ public long getLong() { - String value = System.getProperty(key); - if (value == null && defaultVal == null) + String value = System.getProperty(key, defaultVal); + if (value == null) throw new ConfigurationException("Missing property value or default value is not set: " + key); - return LONG_CONVERTER.convert(value == null ? defaultVal : value); + return LONG_CONVERTER.convert(value); } /** @@ -918,10 +916,10 @@ public enum CassandraRelevantProperties */ public double getDouble() { - String value = System.getProperty(key); - if (value == null && defaultVal == null) + String value = System.getProperty(key, defaultVal); + if (value == null) throw new ConfigurationException("Missing property value or default value is not set: " + key); - return DOUBLE_CONVERTER.convert(value == null ? defaultVal : value); + return DOUBLE_CONVERTER.convert(value); } /** @@ -943,10 +941,10 @@ public enum CassandraRelevantProperties */ public long getSizeInBytes() { - String value = System.getProperty(key); - if (value == null && defaultVal == null) + String value = System.getProperty(key, defaultVal); + if (value == null) throw new ConfigurationException("Missing property value or default value is not set: " + key); - return SIZE_IN_BYTES_CONVERTER.convert(value == null ? defaultVal : value); + return SIZE_IN_BYTES_CONVERTER.convert(value); } /**