You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2010/04/13 23:58:29 UTC
svn commit: r933798 - in
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map:
PortletRequestParameterMap.java PortletRequestParameterValuesMap.java
Author: mfreedman
Date: Tue Apr 13 21:58:29 2010
New Revision: 933798
URL: http://svn.apache.org/viewvc?rev=933798&view=rev
Log:
PORTLETBRIDGE-132: Tweaked fix to also support/us workaround for the Resource phase as well since WebSphere seems to also get this wrong.
Modified:
myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java
myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java?rev=933798&r1=933797&r2=933798&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java Tue Apr 13 21:58:29 2010
@@ -130,7 +130,9 @@ public class PortletRequestParameterMap
// For other phases rely on the portlet api to get the private param map
Map <String, String[]> privateParams = mPortletRequest.getPrivateParameterMap();
- if (BridgeUtil.getPortletRequestPhase() == Bridge.PortletPhase.ACTION_PHASE && (privateParams == null || privateParams.size() == 0))
+ if ((BridgeUtil.getPortletRequestPhase() == Bridge.PortletPhase.ACTION_PHASE ||
+ BridgeUtil.getPortletRequestPhase() == Bridge.PortletPhase.RESOURCE_PHASE) &&
+ (privateParams == null || privateParams.size() == 0))
{
Map<String, String[]> allParams = mPortletRequest.getParameterMap();
Map<String, String[]> publicParams = mPortletRequest.getPublicParameterMap();
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java?rev=933798&r1=933797&r2=933798&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java Tue Apr 13 21:58:29 2010
@@ -165,7 +165,9 @@ public class PortletRequestParameterValu
// For other phases rely on the portlet api to get the private param map
Map <String, String[]> privateParams = mPortletRequest.getPrivateParameterMap();
- if (BridgeUtil.getPortletRequestPhase() == Bridge.PortletPhase.ACTION_PHASE && (privateParams == null || privateParams.size() == 0))
+ if ((BridgeUtil.getPortletRequestPhase() == Bridge.PortletPhase.ACTION_PHASE ||
+ BridgeUtil.getPortletRequestPhase() == Bridge.PortletPhase.RESOURCE_PHASE) &&
+ (privateParams == null || privateParams.size() == 0))
{
Map<String, String[]> allParams = mPortletRequest.getParameterMap();
Map<String, String[]> publicParams = mPortletRequest.getPublicParameterMap();