Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 961881958A for ; Mon, 14 Mar 2016 22:02:42 +0000 (UTC) Received: (qmail 40578 invoked by uid 500); 14 Mar 2016 21:59:31 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 40536 invoked by uid 500); 14 Mar 2016 21:59:31 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 40524 invoked by uid 99); 14 Mar 2016 21:59:29 -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; Mon, 14 Mar 2016 21:59:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9EC9BDFA40; Mon, 14 Mar 2016 21:59:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cmccabe@apache.org To: common-commits@hadoop.apache.org Message-Id: <748b61d0488d4b4aa894aeb21918ac90@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-9947. Block#toString should not output information from derived classes (cmccabe) Date: Mon, 14 Mar 2016 21:59:29 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk bd5556ba1 -> 9a43094e1 HDFS-9947. Block#toString should not output information from derived classes (cmccabe) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9a43094e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9a43094e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9a43094e Branch: refs/heads/trunk Commit: 9a43094e12ab8d35d49ceda2e2c5f83093bb3a5b Parents: bd5556b Author: Colin Patrick Mccabe Authored: Mon Mar 14 14:59:11 2016 -0700 Committer: Colin Patrick Mccabe Committed: Mon Mar 14 14:59:11 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hdfs/protocol/Block.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a43094e/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/Block.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/Block.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/Block.java index 23bfa95..4128ece 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/Block.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/Block.java @@ -162,7 +162,9 @@ public class Block implements Writable, Comparable { */ public static String toString(final Block b) { StringBuilder sb = new StringBuilder(); - b.appendStringTo(sb); + sb.append(BLOCK_FILE_PREFIX). + append(b.blockId).append("_"). + append(b.generationStamp); return sb.toString(); }