hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
Subject svn commit: r1497935 - in /hadoop/common/branches/branch-1.2: CHANGES.txt src/mapred/org/apache/hadoop/mapred/JSPUtil.java
Date Fri, 28 Jun 2013 21:37:21 GMT
Author: acmurthy
Date: Fri Jun 28 21:37:20 2013
New Revision: 1497935

URL: http://svn.apache.org/r1497935
Log:
Merge -c 1497933 from branch-1 to branch-1.2 to fix MAPREDUCE-5318. Escape ampersand in JSPUtil.
Contributed by Bohou Li.

Modified:
    hadoop/common/branches/branch-1.2/CHANGES.txt
    hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/JSPUtil.java

Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1497935&r1=1497934&r2=1497935&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Fri Jun 28 21:37:20 2013
@@ -35,6 +35,8 @@ Release 1.2.1 - Unreleased 
     MAPREDUCE-5260. Fix JvmManager to deal better with corner-cases in
     shutting down. (zhaoyunjiong via acmurthy) 
 
+    MAPREDUCE-5318. Escape ampersand in JSPUtil. (Bohou Li via acmurthy)
+
 Release 1.2.0 - 2013.05.05
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/JSPUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/JSPUtil.java?rev=1497935&r1=1497934&r2=1497935&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/JSPUtil.java (original)
+++ hadoop/common/branches/branch-1.2/src/mapred/org/apache/hadoop/mapred/JSPUtil.java Fri
Jun 28 21:37:20 2013
@@ -344,7 +344,7 @@ class JSPUtil {
         }
 
         sb.append("<td id=\"job_" + rowId
-            + "\"><a href=\"jobdetails.jsp?jobid=" + jobid + "&refresh="
+            + "\"><a href=\"jobdetails.jsp?jobid=" + jobid + "&amp;refresh="
             + refresh + "\">" + jobid + "</a></td>"
             + "<td id=\"started_" + rowId + "\">" + time + "</td>"
             + "<td id=\"priority_" + rowId + "\">"



Mime
View raw message