Updated Branches: refs/heads/trunk 09d3d2b83 -> 2b53cf78f
StorageService.getPartitioner is a static method Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2b53cf78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b53cf78 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b53cf78 Branch: refs/heads/trunk Commit: 2b53cf78f53b333f90f0b3d55e209483d0434f75 Parents: 09d3d2b Author: Dave Brosius <[email protected]> Authored: Wed Jul 17 22:36:24 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Wed Jul 17 22:36:24 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/functions/TokenFct.java | 2 +- src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b53cf78/src/java/org/apache/cassandra/cql3/functions/TokenFct.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/functions/TokenFct.java b/src/java/org/apache/cassandra/cql3/functions/TokenFct.java index 21695ca..69e2bf4 100644 --- a/src/java/org/apache/cassandra/cql3/functions/TokenFct.java +++ b/src/java/org/apache/cassandra/cql3/functions/TokenFct.java @@ -32,7 +32,7 @@ import org.apache.cassandra.service.StorageService; public class TokenFct extends AbstractFunction { // The actual token function depends on the partitioner used - private static final IPartitioner partitioner = StorageService.instance.getPartitioner(); + private static final IPartitioner partitioner = StorageService.getPartitioner(); public static final Function.Factory factory = new Function.Factory() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b53cf78/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index ee1e29a..3b5b69e 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -1333,7 +1333,7 @@ public class StorageProxy implements StorageProxyMBean public static List<InetAddress> getLiveSortedEndpoints(Keyspace keyspace, ByteBuffer key) { - return getLiveSortedEndpoints(keyspace, StorageService.instance.getPartitioner().decorateKey(key)); + return getLiveSortedEndpoints(keyspace, StorageService.getPartitioner().decorateKey(key)); } private static List<InetAddress> getLiveSortedEndpoints(Keyspace keyspace, RingPosition pos)
