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 2013/10/14 23:38:51 UTC
[2/6] git commit: Allow log4j-server.properties to be a symlink.
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6170
Allow log4j-server.properties to be a symlink.
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6170
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6d35ba3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6d35ba3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6d35ba3
Branch: refs/heads/cassandra-2.0
Commit: d6d35ba31e193cfd6f73019c3dbe97670f782e61
Parents: bafb966
Author: Brandon Williams <br...@apache.org>
Authored: Mon Oct 14 16:34:49 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Oct 14 16:35:35 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6d35ba3/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 448bb0a..5169d00 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -108,7 +108,7 @@ public class CassandraDaemon
File configFile = new File(configFileName);
// then try alternative approach which works for all hierarchical URLs with or without spaces
if (!configFile.exists())
- configFileName = new File(configLocation.toURI()).getCanonicalPath();
+ configFileName = new File(configLocation.toURI()).getPath();
}
catch (Exception e)
{