Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 12562 invoked from network); 4 May 2009 15:00:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 May 2009 15:00:12 -0000 Received: (qmail 87269 invoked by uid 500); 4 May 2009 15:00:12 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 87246 invoked by uid 500); 4 May 2009 15:00:12 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Received: (qmail 87236 invoked by uid 99); 4 May 2009 15:00:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 May 2009 15:00:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 May 2009 15:00:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 97E9423888A6; Mon, 4 May 2009 14:59:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r771325 - in /incubator/cassandra/trunk/src/java/org/apache/cassandra/service: ConsistencyManager.java StorageService.java Date: Mon, 04 May 2009 14:59:51 -0000 To: cassandra-commits@incubator.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090504145951.97E9423888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Mon May 4 14:59:51 2009 New Revision: 771325 URL: http://svn.apache.org/viewvc?rev=771325&view=rev Log: do not leave variables uninitialized in ConsistencyManager constructor. fixes regression from #95. patch by jbellis for CASSANDRA-124 Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java?rev=771325&r1=771324&r2=771325&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java Mon May 4 14:59:51 2009 @@ -145,16 +145,18 @@ } } } + private static long scheduledTimeMillis_ = 600; private static ICachetable readRepairTable_ = new Cachetable(scheduledTimeMillis_); - private Row row_; - protected List replicas_; - - private ReadCommand readCommand_; - - public ConsistencyManager(Row row_, List replicas_, ReadCommand readCommand) + private final Row row_; + protected final List replicas_; + private final ReadCommand readCommand_; + + public ConsistencyManager(Row row, List replicas, ReadCommand readCommand) { - this.readCommand_ = readCommand; + row_ = row; + replicas_ = replicas; + readCommand_ = readCommand; } public void run() @@ -165,7 +167,7 @@ { Message messageDigestOnly = readCommandDigestOnly.makeReadMessage(); IAsyncCallback digestResponseHandler = new DigestResponseHandler(); - MessagingService.getMessagingInstance().sendRR(messageDigestOnly, replicas_.toArray(new EndPoint[0]), digestResponseHandler); + MessagingService.getMessagingInstance().sendRR(messageDigestOnly, replicas_.toArray(new EndPoint[replicas_.size()]), digestResponseHandler); } catch ( IOException ex ) { Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=771325&r1=771324&r2=771325&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Mon May 4 14:59:51 2009 @@ -549,9 +549,9 @@ * sure that the N replicas are in sync. We do this in the * background when we do not care much about consistency. */ - public void doConsistencyCheck(Row row, List endpoints, ReadCommand message) + public void doConsistencyCheck(Row row, List endpoints, ReadCommand command) { - Runnable consistencySentinel = new ConsistencyManager(row.cloneMe(), endpoints, message); + Runnable consistencySentinel = new ConsistencyManager(row.cloneMe(), endpoints, command); consistencyManager_.submit(consistencySentinel); }