cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [05/10] git commit: simplify
Date Wed, 04 Dec 2013 23:57:07 GMT
simplify


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

Branch: refs/heads/trunk
Commit: 447c64c407f653467eaca73c8b8eda9b29fa91a4
Parents: 6724964
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Dec 4 17:40:24 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Dec 4 17:40:24 2013 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/447c64c4/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7cdc4e6..e84b819 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1118,7 +1118,7 @@ public class DatabaseDescriptor
 
     public static File getSerializedCachePath(String ksName, String cfName, CacheService.CacheType
cacheType, String version)
     {
-        return new File(conf.saved_caches_directory + File.separator + ksName + "-" + cfName
+ "-" + cacheType + (version == null ? "" : "-" + version + ".db"));
+        return new File(conf.saved_caches_directory, ksName + "-" + cfName + "-" + cacheType
+ (version == null ? "" : "-" + version + ".db"));
     }
 
     public static int getDynamicUpdateInterval()


Mime
View raw message