You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/10/24 11:15:17 UTC
svn commit: r328006 -
/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
Author: cziegeler
Date: Mon Oct 24 02:14:50 2005
New Revision: 328006
URL: http://svn.apache.org/viewcvs?rev=328006&view=rev
Log:
Fix parameter handling
Modified:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java?rev=328006&r1=328005&r2=328006&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java Mon Oct 24 02:14:50 2005
@@ -129,23 +129,22 @@
}
}
- // get request params if the wrapped request is not the Cocoon request
- if ( currentRequest == this.originalRequest ) {
- Enumeration parameters = currentRequest.getParameterNames();
- while (parameters.hasMoreElements()) {
- String paramName = (String) parameters.nextElement();
- String[] paramValues = this.getRequest().getParameterValues(paramName);
- String[] values = (String[]) this.portletParameterMap.get(paramName);
+ // get request params from the original Cocoon request
+ // but filter all cocoon portal request parameters.
+ Enumeration parameters = currentRequest.getParameterNames();
+ while (parameters.hasMoreElements()) {
+ String paramName = (String) parameters.nextElement();
+ String[] paramValues = this.getRequest().getParameterValues(paramName);
+ String[] values = (String[]) this.portletParameterMap.get(paramName);
- if ( !paramName.startsWith("cocoon-") ) {
- if (values != null) {
- String[] temp = new String[paramValues.length + values.length];
- System.arraycopy(paramValues, 0, temp, 0, paramValues.length);
- System.arraycopy(values, 0, temp, paramValues.length, values.length);
- paramValues = temp;
- }
- this.portletParameterMap.put(paramName, paramValues);
+ if ( !paramName.startsWith("cocoon-") ) {
+ if (values != null) {
+ String[] temp = new String[paramValues.length + values.length];
+ System.arraycopy(paramValues, 0, temp, 0, paramValues.length);
+ System.arraycopy(values, 0, temp, paramValues.length, values.length);
+ paramValues = temp;
}
+ this.portletParameterMap.put(paramName, paramValues);
}
}
}