Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-1153. svn merge -c 1339706 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339713 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-05-17 17:01:23 +00:00
parent b35de62e1d
commit 0319ebb42a
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -64,6 +64,9 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-3433. GetImageServlet should allow administrative requestors when security is enabled. (atm) HDFS-3433. GetImageServlet should allow administrative requestors when security is enabled. (atm)
HDFS-1153. dfsnodelist.jsp should handle invalid input parameters.
(Ravi Phulari via eli)
Release 2.0.0-alpha - UNRELEASED Release 2.0.0-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
View File

@ -587,6 +587,10 @@ class NamenodeJspHelper {
whatNodes = request.getParameter("whatNodes"); // show only live or only whatNodes = request.getParameter("whatNodes"); // show only live or only
// dead nodes // dead nodes
if (null == whatNodes || whatNodes.isEmpty()) {
out.print("Invalid input");
return;
}
sorterField = request.getParameter("sorter/field"); sorterField = request.getParameter("sorter/field");
sorterOrder = request.getParameter("sorter/order"); sorterOrder = request.getParameter("sorter/order");
if (sorterField == null) if (sorterField == null)
@ -714,6 +718,8 @@ class NamenodeJspHelper {
} }
out.print("</table>\n"); out.print("</table>\n");
} }
} else {
out.print("Invalid input");
} }
out.print("</div>"); out.print("</div>");
} }