Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9F058200B61 for ; Tue, 26 Jul 2016 06:54:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9DA4B160A8F; Tue, 26 Jul 2016 04:54:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E3DEC160A7D for ; Tue, 26 Jul 2016 06:54:05 +0200 (CEST) Received: (qmail 17743 invoked by uid 500); 26 Jul 2016 04:54:05 -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 17732 invoked by uid 99); 26 Jul 2016 04:54:04 -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 Jul 2016 04:54:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D70D6E00A7; Tue, 26 Jul 2016 04:54:04 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: push down logging code to where it's used Date: Tue, 26 Jul 2016 04:54:04 +0000 (UTC) archived-at: Tue, 26 Jul 2016 04:54:06 -0000 Repository: cassandra Updated Branches: refs/heads/trunk c8a365309 -> 0f6461849 push down logging code to where it's used Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f646184 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f646184 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f646184 Branch: refs/heads/trunk Commit: 0f6461849c0acf146a019094dce55249113678b5 Parents: c8a3653 Author: Dave Brosius Authored: Tue Jul 26 00:53:47 2016 -0400 Committer: Dave Brosius Committed: Tue Jul 26 00:53:47 2016 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/JsonTransformer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f646184/src/java/org/apache/cassandra/tools/JsonTransformer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/JsonTransformer.java b/src/java/org/apache/cassandra/tools/JsonTransformer.java index 3b98595..72008ab 100644 --- a/src/java/org/apache/cassandra/tools/JsonTransformer.java +++ b/src/java/org/apache/cassandra/tools/JsonTransformer.java @@ -176,7 +176,6 @@ public final class JsonTransformer private void serializePartition(UnfilteredRowIterator partition) { - String key = metadata.getKeyValidator().getString(partition.partitionKey().getKey()); try { json.writeStartObject(); @@ -223,6 +222,7 @@ public final class JsonTransformer } catch (IOException e) { + String key = metadata.getKeyValidator().getString(partition.partitionKey().getKey()); logger.error("Fatal error parsing partition: {}", key, e); } }