Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DA08C17C6B for ; Tue, 26 May 2015 04:49:49 +0000 (UTC) Received: (qmail 35777 invoked by uid 500); 26 May 2015 04:49:49 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 35647 invoked by uid 500); 26 May 2015 04:49:49 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 35618 invoked by uid 99); 26 May 2015 04:49:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 May 2015 04:49:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4359BE04E5; Tue, 26 May 2015 04:49:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Tue, 26 May 2015 04:49:49 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cassandra git commit: fix wrong variable in warning message Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 bb1f13104 -> 587b654ed fix wrong variable in warning message Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a571c62 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a571c62 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a571c62 Branch: refs/heads/cassandra-2.2 Commit: 5a571c6291678d7f92c120d1f9b366374e51c07d Parents: be9eff5 Author: Dave Brosius Authored: Tue May 26 00:42:58 2015 -0400 Committer: Dave Brosius Committed: Tue May 26 00:42:58 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/compaction/Scrubber.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a571c62/src/java/org/apache/cassandra/db/compaction/Scrubber.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/Scrubber.java b/src/java/org/apache/cassandra/db/compaction/Scrubber.java index e5bcd25..ea10855 100644 --- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java +++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java @@ -199,7 +199,7 @@ public class Scrubber implements Closeable throw new IOError(new IOException("Impossible row size (greater than file length): " + dataSize)); if (dataStart != dataStartFromIndex) - outputHandler.warn(String.format("Data file row position %d differs from index file row position %d", dataStart, dataSizeFromIndex)); + outputHandler.warn(String.format("Data file row position %d differs from index file row position %d", dataStart, dataStartFromIndex)); if (dataSize != dataSizeFromIndex) outputHandler.warn(String.format("Data file row size %d differs from index file row size %d", dataSize, dataSizeFromIndex));