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 sz...@apache.org on 2011/10/14 02:32:34 UTC
svn commit: r1183176 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt
src/hdfs/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
src/hdfs/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
Author: szetszwo
Date: Fri Oct 14 00:32:33 2011
New Revision: 1183176
URL: http://svn.apache.org/viewvc?rev=1183176&view=rev
Log:
HDFS-2424. Added a root element "HdfsFileStatuses" for the response of webhdfs listStatus.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
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=1183176&r1=1183175&r2=1183176&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Fri Oct 14 00:32:33 2011
@@ -52,6 +52,9 @@ Release 0.20.205.1 - unreleased
to IllegalArgumentException and response it as http BAD_REQUEST in webhdfs.
(szetszwo)
+ HDFS-2424. Added a root element "HdfsFileStatuses" for the response
+ of webhdfs listStatus. (szetszwo)
+
Release 0.20.205.0 - unreleased
NEW FEATURES
Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java?rev=1183176&r1=1183175&r2=1183176&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java Fri Oct 14 00:32:33 2011
@@ -484,7 +484,8 @@ public class NamenodeWebHdfsMethods {
@Override
public void write(final OutputStream outstream) throws IOException {
final PrintStream out = new PrintStream(outstream);
- out.println("{\"" + HdfsFileStatus.class.getSimpleName() + "\":[");
+ out.println("{\"" + HdfsFileStatus.class.getSimpleName() + "es\":{\""
+ + HdfsFileStatus.class.getSimpleName() + "\":[");
final HdfsFileStatus[] partial = first.getPartialListing();
if (partial.length > 0) {
@@ -503,7 +504,8 @@ public class NamenodeWebHdfsMethods {
}
}
- out.println("]}");
+ out.println();
+ out.println("]}}");
}
};
}
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=1183176&r1=1183175&r2=1183176&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 Fri Oct 14 00:32:33 2011
@@ -482,8 +482,8 @@ public class WebHdfsFileSystem extends F
final HttpOpParam.Op op = GetOpParam.Op.LISTSTATUS;
final Map<?, ?> json = run(op, f);
- final Object[] array = (Object[])json.get(
- HdfsFileStatus.class.getSimpleName());
+ final Map<?, ?> rootmap = (Map<?, ?>)json.get(HdfsFileStatus.class.getSimpleName() + "es");
+ final Object[] array = (Object[])rootmap.get(HdfsFileStatus.class.getSimpleName());
//convert FileStatus
final FileStatus[] statuses = new FileStatus[array.length];