From be2b0921fa3d1d82fed75bccfceae007d9faaea6 Mon Sep 17 00:00:00 2001 From: Tsz-wo Sze Date: Thu, 15 Sep 2011 08:04:46 +0000 Subject: [PATCH] HDFS-2331. Fix WebHdfsFileSystem compilation problems for a bug in JDK version < 1.6.0_26. Contributed by Abhijit Suresh Shingate git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1170996 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 84aca2d256..5b55911182 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -35,6 +35,9 @@ Trunk (unreleased changes) HDFS-2314. MRV1 test compilation broken after HDFS-2197 (todd) + HDFS-2331. Fix WebHdfsFileSystem compilation problems for a bug in JDK + version < 1.6.0_26. (Abhijit Suresh Shingate via szetszwo) + Release 0.23.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java index 72d86a011c..2f88bca783 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java @@ -206,7 +206,7 @@ private T run(final HttpOpParam.Op op, final Path fspath, final HttpURLConnection conn = httpConnect(op, fspath, parameters); validateResponse(op, conn); try { - return jsonParse(conn.getInputStream()); + return WebHdfsFileSystem.jsonParse(conn.getInputStream()); } finally { conn.disconnect(); }