Author: omalley
Date: Mon Sep 28 20:30:28 2009
New Revision: 819720
URL: http://svn.apache.org/viewvc?rev=819720&view=rev
Log:
HADOOP-6285. Fix the result type of the getParameterMap method in the
HttpServer.QuotingInputFilter. (omalley)
Added:
hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/http/TestHttpServer.java
- copied unchanged from r819670,
hadoop/common/trunk/src/test/core/org/apache/hadoop/http/TestHttpServer.java
Modified:
hadoop/common/branches/branch-0.21/ (props changed)
hadoop/common/branches/branch-0.21/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.21/src/contrib/ec2/ (props changed)
hadoop/common/branches/branch-0.21/src/docs/ (props changed)
hadoop/common/branches/branch-0.21/src/java/ (props changed)
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/http/HttpServer.java
hadoop/common/branches/branch-0.21/src/test/core/ (props changed)
Propchange: hadoop/common/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 20:30:28 2009
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:818543
+/hadoop/common/trunk:818543,819670
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=819720&r1=819719&r2=819720&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Mon Sep 28 20:30:28 2009
@@ -1072,6 +1072,9 @@
HADOOP-6281. Avoid null pointer exceptions when the jsps don't have
paramaters (omalley)
+ HADOOP-6285. Fix the result type of the getParameterMap method in the
+ HttpServer.QuotingInputFilter. (omalley)
+
Release 0.20.1 - 2009-09-01
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 20:30:28 2009
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:818543
+/hadoop/common/trunk/CHANGES.txt:818543,819670
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.21/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 20:30:28 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:818543
+/hadoop/common/trunk/src/contrib/ec2:818543,819670
/hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
/hadoop/core/trunk/src/contrib/ec2:776175-784663
Propchange: hadoop/common/branches/branch-0.21/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 20:30:28 2009
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:818543
+/hadoop/common/trunk/src/docs:818543,819670
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 20:30:28 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:818543
+/hadoop/common/trunk/src/java:818543,819670
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified:
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/http/HttpServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/http/HttpServer.java?rev=819720&r1=819719&r2=819720&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/http/HttpServer.java
(original)
+++
hadoop/common/branches/branch-0.21/src/java/org/apache/hadoop/http/HttpServer.java
Mon Sep 28 20:30:28 2009
@@ -584,12 +584,16 @@
@SuppressWarnings("unchecked")
@Override
- public Map<String, String> getParameterMap() {
- Map<String, String> result = new HashMap<String,String>();
- Map<String, String> raw = rawRequest.getParameterMap();
- for (Map.Entry<String,String> item: raw.entrySet()) {
- result.put(HtmlQuoting.quoteHtmlChars(item.getKey()),
- HtmlQuoting.quoteHtmlChars(item.getValue()));
+ public Map<String, String[]> getParameterMap() {
+ Map<String, String[]> result = new HashMap<String,String[]>();
+ Map<String, String[]> raw = rawRequest.getParameterMap();
+ for (Map.Entry<String,String[]> item: raw.entrySet()) {
+ String[] rawValue = item.getValue();
+ String[] cookedValue = new String[rawValue.length];
+ for(int i=0; i< rawValue.length; ++i) {
+ cookedValue[i] = HtmlQuoting.quoteHtmlChars(rawValue[i]);
+ }
+ result.put(HtmlQuoting.quoteHtmlChars(item.getKey()), cookedValue);
}
return result;
}
Propchange: hadoop/common/branches/branch-0.21/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 28 20:30:28 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:818543
+/hadoop/common/trunk/src/test/core:818543,819670
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
