Author: omalley
Date: Fri Mar 4 04:54:26 2011
New Revision: 1077778
URL: http://svn.apache.org/viewvc?rev=1077778&view=rev
Log:
commit 80ff324d50e3f12f11a02e6fdd08cfdd4082c330
Author: Tsz Wo Wo Sze <[email protected]>
Date: Thu Jan 27 23:59:56 2011 +0000
/HDFS:1598. Directory listing on hftp:// does not show .*.crc files.
+++ b/YAHOO-CHANGES.txt
+ /HDFS:1598. Directory listing on hftp:// does not show
+ .*.crc files. (szetszwo)
+
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestListPathServlet.java
hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/browseDirectory.jsp
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java?rev=1077778&r1=1077777&r2=1077778&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
Fri Mar 4 04:54:26 2011
@@ -85,7 +85,7 @@ public class ListPathsServlet extends Df
final String path = request.getPathInfo() != null
? request.getPathInfo() : "/";
final String exclude = request.getParameter("exclude") != null
- ? request.getParameter("exclude") : "\\..*\\.crc";
+ ? request.getParameter("exclude") : "";
final String filter = request.getParameter("filter") != null
? request.getParameter("filter") : ".*";
final boolean recur = request.getParameter("recursive") != null
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestListPathServlet.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestListPathServlet.java?rev=1077778&r1=1077777&r2=1077778&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestListPathServlet.java
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestListPathServlet.java
Fri Mar 4 04:54:26 2011
@@ -94,7 +94,7 @@ public class TestListPathServlet {
checkStatus("/");
// A directory with files and directories
- createFile("/dir/a", 1);
+ createFile("/dir/.a.crc", 1);
createFile("/dir/b", 1);
mkdirs("/dir/dir1");
checkStatus("/dir");
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/browseDirectory.jsp
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/browseDirectory.jsp?rev=1077778&r1=1077777&r2=1077778&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/browseDirectory.jsp
(original)
+++
hadoop/common/branches/branch-0.20-security-patches/src/webapps/datanode/browseDirectory.jsp
Fri Mar 4 04:54:26 2011
@@ -117,7 +117,6 @@
for (int i = 0; i < files.length; i++) {
//Get the location of the first block of the file
String localname = files[i].getLocalName();
- if (localname.endsWith(".crc")) continue;
if (!files[i].isDir()) {
cols[1] = "file";
cols[2] = StringUtils.byteDesc(files[i].getLen());
