Repository: hadoop Updated Branches: refs/heads/branch-2 51b7d8935 -> 8ac3fc754
HDFS-9947. Block#toString should not output information from derived classes (cmccabe) (cherry picked from commit 9a43094e12ab8d35d49ceda2e2c5f83093bb3a5b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8ac3fc75 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8ac3fc75 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8ac3fc75 Branch: refs/heads/branch-2 Commit: 8ac3fc7540eb7006534cadc6755e7196e764b0ec Parents: 51b7d89 Author: Colin Patrick Mccabe <cmcc...@cloudera.com> Authored: Mon Mar 14 14:59:11 2016 -0700 Committer: Colin Patrick Mccabe <cmcc...@cloudera.com> Committed: Mon Mar 14 14:59:46 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/8ac3fc75/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<Block> { */ 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(); }
