You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2009/03/27 03:32:46 UTC
svn commit: r758989 - in
/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container:
impl/PortletRequestContextImpl.java
state/impl/PortletWindowRequestNavigationalState.java
Author: ate
Date: Fri Mar 27 02:32:45 2009
New Revision: 758989
URL: http://svn.apache.org/viewvc?rev=758989&view=rev
Log:
Some fixes to private render parameter handling
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletRequestContextImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowRequestNavigationalState.java
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletRequestContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletRequestContextImpl.java?rev=758989&r1=758988&r2=758989&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletRequestContextImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/impl/PortletRequestContextImpl.java Fri Mar 27 02:32:45 2009
@@ -135,11 +135,36 @@
mergeRequestParameters = ns.getPortletWindowOfAction() != null || ns.getPortletWindowOfResource() != null;
Map<String, String[]> paramMap = ns.getParameterMap(window);
- if (paramMap != null)
+ if (paramMap != null && !paramMap.isEmpty())
{
privateParameters.putAll(paramMap);
}
+ Map<String, String[]> privateParamMap = getPrivateRenderParameterMap();
+
+ if (privateParamMap != null && !privateParamMap.isEmpty())
+ {
+ if (privateParameters.isEmpty())
+ {
+ privateParameters.putAll(privateParamMap);
+ }
+ else for (Map.Entry<String, String[]> entry : privateParamMap.entrySet())
+ {
+ String[] values = privateParameters.get(entry.getKey());
+ if (values == null)
+ {
+ privateParameters.put(entry.getKey(), entry.getValue());
+ }
+ else
+ {
+ String[] combined = new String[values.length+entry.getValue().length];
+ System.arraycopy(values,0,combined,0,values.length);
+ System.arraycopy(entry.getValue(),0,combined,values.length,entry.getValue().length);
+ privateParameters.put(entry.getKey(), combined);
+ }
+ }
+ }
+
PortletDefinition portletDef = window.getPortletDefinition();
GenericMetadata metaData = portletDef.getMetadata();
if (!mergeRequestParameters)
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowRequestNavigationalState.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowRequestNavigationalState.java?rev=758989&r1=758988&r2=758989&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowRequestNavigationalState.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowRequestNavigationalState.java Fri Mar 27 02:32:45 2009
@@ -160,7 +160,7 @@
{
if (privateRenderParametersMap == null)
{
- privateRenderParametersMap = Collections.emptyMap();
+ privateRenderParametersMap = new HashMap<String, String[]>();
}
privateRenderParametersMap.put(name, values);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org