From 46cbce9af1272ce0eb6e300f96a1a8d4b08e23e3 Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Wed, 13 Nov 2013 02:00:41 +0000 Subject: [PATCH] HDFS-5508. Fix compilation error after merge. (Contributed by szetszwo) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1541352 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt | 2 ++ .../src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt index 227e8eb4c9e..1e33fa0e0a8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES_HDFS-2832.txt @@ -99,3 +99,5 @@ IMPROVEMENTS: HDFS-5494. Fix findbugs warnings for HDFS-2832. (Arpit Agarwal) + HDFS-5508. Fix compilation error after merge. (Contributed by szetszwo) + diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java index 58fafdee07f..63fbda61d6b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java @@ -414,7 +414,7 @@ public class JsonUtil { (Object[])m.get("cachedLocations")); final LocatedBlock locatedblock = new LocatedBlock(b, locations, - startOffset, isCorrupt, cachedLocations); + null, null, startOffset, isCorrupt, cachedLocations); locatedblock.setBlockToken(toBlockToken((Map)m.get("blockToken"))); return locatedblock; }