You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/06/09 20:20:08 UTC
svn commit: r783089 -
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/MultipartRequestWrapper.java
Author: lu4242
Date: Tue Jun 9 18:20:08 2009
New Revision: 783089
URL: http://svn.apache.org/viewvc?rev=783089&view=rev
Log:
TOMAHAWK-1108 MultipartRequestWrapper doesn't handle request parameters correctly in JSF 1.2/JSP 2.1 (parametersMap takes precedence over request.getParameterMap)
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/MultipartRequestWrapper.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/MultipartRequestWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/MultipartRequestWrapper.java?rev=783089&r1=783088&r2=783089&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/MultipartRequestWrapper.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/webapp/filter/MultipartRequestWrapper.java Tue Jun 9 18:20:08 2009
@@ -264,8 +264,8 @@
if( parametersMap == null ) parseRequest();
//return Collections.enumeration( parametersMap.keySet() );
- HashSet mergedNames = new HashSet(parametersMap.keySet());
- mergedNames.addAll(request.getParameterMap().keySet());
+ HashSet mergedNames = new HashSet(request.getParameterMap().keySet());
+ mergedNames.addAll(parametersMap.keySet());
return Collections.enumeration( mergedNames );
}
@@ -314,8 +314,8 @@
if( parametersMap == null ) parseRequest();
//return parametersMap;
- HashMap mergedMap = new HashMap(parametersMap);
- mergedMap.putAll(request.getParameterMap());
+ HashMap mergedMap = new HashMap(request.getParameterMap());
+ mergedMap.putAll(parametersMap);
return mergedMap;
}