cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [2/5] git commit: Revert "add file:/// on Windows to -Dcassandra.config value"
Date Mon, 23 Jun 2014 15:31:11 GMT
Revert "add file:/// on Windows to -Dcassandra.config value"

This reverts commit 498ee24b52a6876a008c3d3d3ef4870e4bd9842c.


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2420cb46
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2420cb46
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2420cb46

Branch: refs/heads/trunk
Commit: 2420cb46bf3b5c07069a24f56af73d8a00d9673f
Parents: a7ad9d2
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Jun 23 10:29:25 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Jun 23 10:29:25 2014 -0500

----------------------------------------------------------------------
 .../apache/cassandra/config/YamlConfigurationLoader.java  | 10 ----------
 1 file changed, 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2420cb46/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
index e5885b1..4a1280c 100644
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@ -33,7 +33,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.utils.FBUtilities;
 import org.yaml.snakeyaml.TypeDescription;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.error.YAMLException;
@@ -46,7 +45,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader
     private static final Logger logger = LoggerFactory.getLogger(YamlConfigurationLoader.class);
 
     private final static String DEFAULT_CONFIGURATION = "cassandra.yaml";
-    private static final String FILE_PREFIX = "file:///";
 
     /**
      * Inspect the classpath to find storage configuration file
@@ -55,15 +53,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader
     {
         String configUrl = System.getProperty("cassandra.config");
         if (configUrl == null)
-        {
             configUrl = DEFAULT_CONFIGURATION;
-        }
-        else if (!FBUtilities.isUnix() && !configUrl.startsWith(FILE_PREFIX))
-        {
-            String format = "Non-unix environment detected, %s prefix not supplied at the
beginning of file path but is required. Changing path to %s";
-            configUrl = FILE_PREFIX + configUrl;
-            logger.warn(String.format(format, FILE_PREFIX, configUrl));
-        }
 
         URL url;
         try


Mime
View raw message