Author: szetszwo
Date: Thu Sep 15 08:07:25 2011
New Revision: 1170997
URL: http://svn.apache.org/viewvc?rev=1170997&view=rev
Log:
HDFS-2331. Fix WebHdfsFileSystem compilation problems for a bug in JDK version
< 1.6.0_26. Contributed by Abhijit Suresh Shingate
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1170997&r1=1170996&r2=1170997&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Thu Sep 15 08:07:25
2011
@@ -154,6 +154,9 @@ Release 0.20.205.0 - unreleased
HDFS-2328. HFTP throws NPE if security is enabled locally, but not
remotely. (omalley)
+ HDFS-2331. Fix WebHdfsFileSystem compilation problems for a bug in JDK
+ version < 1.6.0_26. (Abhijit Suresh Shingate via szetszwo)
+
IMPROVEMENTS
MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
Modified:
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java?rev=1170997&r1=1170996&r2=1170997&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
(original)
+++
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
Thu Sep 15 08:07:25 2011
@@ -201,7 +201,7 @@ public class WebHdfsFileSystem extends H
final HttpURLConnection conn = httpConnect(op, fspath, parameters);
validateResponse(op, conn);
try {
- return jsonParse(conn.getInputStream());
+ return WebHdfsFileSystem.<T>jsonParse(conn.getInputStream());
} finally {
conn.disconnect();
}