You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/11/26 21:35:09 UTC
[2/6] git commit: fix build more
fix build more
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f626109
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f626109
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f626109
Branch: refs/heads/cassandra-2.0
Commit: 5f62610969a83a1c33e06a3cf20a136961bd0a08
Parents: cc8a05a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Nov 26 14:34:37 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Nov 26 14:34:37 2013 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/PropertyFileSnitch.java | 2 +-
src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f626109/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
index da440af..9138bc2 100644
--- a/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
+++ b/src/java/org/apache/cassandra/locator/PropertyFileSnitch.java
@@ -188,7 +188,7 @@ public class PropertyFileSnitch extends AbstractNetworkTopologySnitch
logger.debug("loaded network topology {}", FBUtilities.toString(reloadedMap));
endpointMap = reloadedMap;
if (StorageService.instance != null) // null check tolerates circular dependency; see CASSANDRA-4145
- StorageService.instance.getTokenMetadata().invalidateCaches();
+ StorageService.instance.getTokenMetadata().invalidateCachedRings();
if (gossipStarted)
StorageService.instance.gossipSnitchInfo();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f626109/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java b/src/java/org/apache/cassandra/locator/TokenMetadata.java
index 818ca8f..b724894 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -1054,7 +1054,7 @@ public class TokenMetadata
return ringVersion;
}
- private void invalidateCachedRings()
+ public void invalidateCachedRings()
{
ringVersion++;
}