Updated Branches: refs/heads/trunk 061595faf -> ac0de1ee2
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac0de1ee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac0de1ee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac0de1ee Branch: refs/heads/trunk Commit: ac0de1ee2b3711b9bc23970aad38c0adee059508 Parents: 061595f 1563837 Author: Peter Schuller <peter.schul...@infidyne.com> Authored: Tue Feb 28 12:19:45 2012 -0800 Committer: Peter Schuller <peter.schul...@infidyne.com> Committed: Tue Feb 28 12:19:45 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageService.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac0de1ee/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 5af19b3,b3c06c8..962f8be --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -421,9 -422,19 +421,19 @@@ public class StorageService implements initialized = true; isClientMode = false; + // Ensure StorageProxy is initialized on start-up; see CASSANDRA-3797. + try + { + Class.forName("org.apache.cassandra.service.StorageProxy"); + } + catch (ClassNotFoundException e) + { + throw new AssertionError(e); + } + if (Boolean.parseBoolean(System.getProperty("cassandra.load_ring_state", "true"))) { - logger_.info("Loading persisted ring state"); + logger.info("Loading persisted ring state"); for (Map.Entry<Token, InetAddress> entry : SystemTable.loadTokens().entrySet()) { if (entry.getValue() == FBUtilities.getLocalAddress())
