svn merge -c 1170997 from branch-0.20-security for HDFS-2331. Contributed by Abhijit Suresh Shingate

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-205@1174481 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -186,6 +186,9 @@ Release 0.20.205.0 - 2011.09.12
     MAPREDUCE-3076. Annotate o.a.h.mapreduce.TestSleepJob with @Ignore since it
     is not a junit test.  (acmurthy via szetszwo)
 
+    HDFS-2331. Fix WebHdfsFileSystem compilation problems for a bug in JDK
+    version < 1.6.0_26.  (Abhijit Suresh Shingate via szetszwo)
+
   IMPROVEMENTS
 
     HADOOP-7655. provide a small validation script that smoke tests the installed

src/hdfs/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java

@@ -201,7 +201,7 @@ public class WebHdfsFileSystem extends HftpFileSystem {
     final HttpURLConnection conn = httpConnect(op, fspath, parameters);
     validateResponse(op, conn);
     try {
-      return jsonParse(conn.getInputStream());
+      return WebHdfsFileSystem.<T>jsonParse(conn.getInputStream());
     } finally {
       conn.disconnect();
     }