svn commit: r1576200 - /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java

[cziegeler]

Author: cziegeler
Date: Tue Mar 11 06:40:22 2014
New Revision: 1576200

URL: http://svn.apache.org/r1576200
Log:
SLING-3439 : SlingRequestProcessor.processRequest(httpServletRequest, 
httpServletResponse, resourceResolver) no longer passes request params through

Modified:
    
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java

Modified: 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java?rev=1576200&r1=1576199&r2=1576200&view=diff
==============================================================================
--- 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
 (original)
+++ 
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
 Tue Mar 11 06:40:22 2014
@@ -228,7 +228,7 @@ public class ParameterSupport {
             // SLING-152 Get parameters from the servlet Container
             ParameterMap parameters = new ParameterMap();
 
-            final boolean isPost = 
"POST".equals(this.getServletRequest().getMethod());
+            boolean useFallback = true;
             // Query String
             final String query = getServletRequest().getQueryString();
             if (query != null) {
@@ -242,11 +242,11 @@ public class ParameterSupport {
                 } catch (IOException e) {
                     this.log.error("getRequestParameterMapInternal: Error 
parsing request", e);
                 }
-            } else if (!isPost) {
-                getContainerParameters(parameters, encoding);
+                useFallback = false;
             }
 
             // POST requests
+            final boolean isPost = 
"POST".equals(this.getServletRequest().getMethod());
             if (isPost) {
                 // WWW URL Form Encoded POST
                 if (isWWWFormEncodedContent(this.getServletRequest())) {
@@ -261,14 +261,19 @@ public class ParameterSupport {
                         this.log.error("getRequestParameterMapInternal: Error 
parsing request", e);
                     }
                     this.requestDataUsed = true;
+                    useFallback = false;
                 }
 
                 // Multipart POST
                 if (ServletFileUpload.isMultipartContent(new 
ServletRequestContext(this.getServletRequest()))) {
                     this.parseMultiPartPost(parameters);
                     this.requestDataUsed = true;
+                    useFallback = false;
                 }
             }
+            if ( useFallback ) {
+                getContainerParameters(parameters, encoding);
+            }
 
             // apply any form encoding (from '_charset_') in the parameter map
             Util.fixEncoding(parameters);