Updated Branches: refs/heads/cassandra-1.1 271405656 -> 38e5cf73d refs/heads/trunk 70e318eaa -> eed76ae9c
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eed76ae9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eed76ae9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eed76ae9 Branch: refs/heads/trunk Commit: eed76ae9c3700649b0b9bdbed81865c86d5e0213 Parents: 70e318e 38e5cf7 Author: Brandon Williams <[email protected]> Authored: Tue Jul 31 10:52:07 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Jul 31 10:52:07 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eed76ae9/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 8cd5b0b,4bbffc8..7a77d02 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -539,10 -586,10 +539,10 @@@ public class StorageService implements // The one exception is if after the above sleep we still have no schema information, we'll assume // we're part of a fresh cluster start, and also skip bootstrap. This is less confusing for new users, // as well as avoiding the nonsensical state of trying to stream from cluster with no active peers. - Token<?> token; - InetAddress current = null; - logger_.debug(String.format("Bootstrap variables: %s %s %s %s", + Set<InetAddress> current = new HashSet<InetAddress>(); + Collection<Token> tokens; - logger.debug("Bootstrap variables: %s %s %s %s", - new Object[] {DatabaseDescriptor.isAutoBootstrap(), SystemTable.bootstrapInProgress(), SystemTable.bootstrapComplete(), schemaPresent}); ++ logger.debug(String.format("Bootstrap variables: %s %s %s %s", + DatabaseDescriptor.isAutoBootstrap(), SystemTable.bootstrapInProgress(), SystemTable.bootstrapComplete(), schemaPresent)); if (DatabaseDescriptor.isAutoBootstrap() && (SystemTable.bootstrapInProgress() || (!SystemTable.bootstrapComplete() && schemaPresent))) {
