Author: tucu
Date: Wed Jun 13 18:00:34 2012
New Revision: 1349975
URL: http://svn.apache.org/viewvc?rev=1349975&view=rev
Log:
MAPREDUCE-4195. With invalid queueName request param, jobqueue_details.jsp shows NPE (jira.shegalov
via tucu)
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/webapps/job/jobqueue_details.jsp
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1349975&r1=1349974&r2=1349975&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Wed Jun 13 18:00:34 2012
@@ -23,6 +23,9 @@ Release 1.2.0 - unreleased
HADOOP-8460. Document proper setting of HADOOP_PID_DIR and
HADOOP_SECURE_DN_PID_DIR (bobby)
+ MAPREDUCE-4195. With invalid queueName request param, jobqueue_details.jsp
+ shows NPE (jira.shegalov via tucu)
+
Release 1.1.0 - unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-1/src/webapps/job/jobqueue_details.jsp
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/webapps/job/jobqueue_details.jsp?rev=1349975&r1=1349974&r2=1349975&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/webapps/job/jobqueue_details.jsp (original)
+++ hadoop/common/branches/branch-1/src/webapps/job/jobqueue_details.jsp Wed Jun 13 18:00:34
2012
@@ -21,6 +21,10 @@ private static final long serialVersionU
TaskScheduler scheduler = tracker.getTaskScheduler();
Collection<JobInProgress> jobs = scheduler.getJobs(queueName);
JobQueueInfo schedInfo = tracker.getQueueInfo(queueName);
+ if (schedInfo == null) {
+ queueName = "INVALID_QUEUE_NAME (" + queueName + ")";
+ schedInfo = new JobQueueInfo(queueName, "INVALID_SCHEDULING_INFO");
+ }
%>
<html>
<head>
|