You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2015/06/15 05:23:36 UTC
hadoop git commit: HDFS-8600.
TestWebHdfsFileSystemContract.testGetFileBlockLocations fails in branch-2.7.
(Contributed by Arpit Agarwal)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 1145d09e0 -> a1810d75f
HDFS-8600. TestWebHdfsFileSystemContract.testGetFileBlockLocations fails in branch-2.7. (Contributed by Arpit Agarwal)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a1810d75
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a1810d75
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a1810d75
Branch: refs/heads/branch-2.7
Commit: a1810d75f05418115c660f2dc02335504fff4935
Parents: 1145d09
Author: Arpit Agarwal <ar...@apache.org>
Authored: Sun Jun 14 20:18:31 2015 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Sun Jun 14 20:18:31 2015 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a1810d75/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index b4ba6aa..7191fc6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -122,6 +122,9 @@ Release 2.7.1 - UNRELEASED
HDFS-8595. TestCommitBlockSynchronization fails in branch-2.7. (Patch
applies to all branches). (Arpit Agarwal)
+ HDFS-8600. TestWebHdfsFileSystemContract.testGetFileBlockLocations fails
+ in branch-2.7. (Arpit Agarwal)
+
Release 2.7.0 - 2015-04-20
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a1810d75/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
----------------------------------------------------------------------
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 4f36965..bd0a5e6 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
@@ -334,10 +334,9 @@ public class JsonUtil {
// Handle the case of old servers (1.x, 0.23.x) sending 'name' instead
// of ipAddr and xferPort.
+ int xferPort = getInt(m, "xferPort", -1);
Object tmpValue = m.get("ipAddr");
String ipAddr = (tmpValue == null) ? null : (String)tmpValue;
- tmpValue = m.get("xferPort");
- int xferPort = (tmpValue == null) ? -1 : (int)(long)(Long)tmpValue;
if (ipAddr == null) {
tmpValue = m.get("name");
if (tmpValue != null) {