Author: cutting
Date: Fri May 18 14:07:05 2007
New Revision: 539603
URL: http://svn.apache.org/viewvc?view=rev&rev=539603
Log:
Merge -r 539600:539601 from trunk to 0.13 branch. Fixes: HADOOP-1388.
Modified:
lucene/hadoop/branches/branch-0.13/CHANGES.txt
lucene/hadoop/branches/branch-0.13/src/webapps/job/taskdetails.jsp
Modified: lucene/hadoop/branches/branch-0.13/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/CHANGES.txt?view=diff&rev=539603&r1=539602&r2=539603
==============================================================================
--- lucene/hadoop/branches/branch-0.13/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.13/CHANGES.txt Fri May 18 14:07:05 2007
@@ -404,6 +404,9 @@
121. HADOOP-1361. Fix various calls to skipBytes() to check return
value. (Hairong Kuang via cutting)
+122. HADOOP-1388. Fix a potential NullPointerException in web ui.
+ (Devaraj Das via cutting)
+
Release 0.12.3 - 2007-04-06
Modified: lucene/hadoop/branches/branch-0.13/src/webapps/job/taskdetails.jsp
URL:
http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/src/webapps/job/taskdetails.jsp?view=diff&rev=539603&r1=539602&r2=539603
==============================================================================
--- lucene/hadoop/branches/branch-0.13/src/webapps/job/taskdetails.jsp
(original)
+++ lucene/hadoop/branches/branch-0.13/src/webapps/job/taskdetails.jsp Fri May
18 14:07:05 2007
@@ -29,7 +29,7 @@
<h2>All Task Attempts</h2>
<center>
<%
- if( ts.length == 0 ) {
+ if( ts == null || ts.length == 0) {
%>
<h3>No Task Attempts found</h3>
<%
