svn commit: r890831 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java

[jo...@apache.org]

Author: jonesde
Date: Tue Dec 15 15:37:12 2009
New Revision: 890831

URL: http://svn.apache.org/viewvc?rev=890831&view=rev
Log:
Based on idea from Patrick Antivackis in issues #OFBIZ-3257: changed order of sources for parameters Map so that request parameters are the lowest priority instead of second highest; in some general/random testing this seems to work fine, and addresses the issue Patrick brought up as well as preserving flexibility

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java?rev=890831&r1=890830&r2=890831&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilHttp.java Tue Dec 15 15:37:12 2009
@@ -85,9 +85,9 @@
      */
     public static Map<String, Object> getCombinedMap(HttpServletRequest request, Set<? extends String> namesToSkip) {
         FastMap<String, Object> combinedMap = FastMap.newInstance();
+        combinedMap.putAll(getParameterMap(request));                   // parameters override nothing
         combinedMap.putAll(getServletContextMap(request, namesToSkip)); // bottom level application attributes
         combinedMap.putAll(getSessionMap(request, namesToSkip));        // session overrides application
-        combinedMap.putAll(getParameterMap(request));                   // parameters override session
         combinedMap.putAll(getAttributeMap(request));                   // attributes trump them all
 
         return combinedMap;