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/30 15:56:25 UTC
svn commit: r759970 -
/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
Author: ate
Date: Mon Mar 30 13:56:25 2009
New Revision: 759970
URL: http://svn.apache.org/viewvc?rev=759970&view=rev
Log:
JS2-925: Provide full JSR-286 / Portlet API 2.0 support and TCK compliance
See: https://issues.apache.org/jira/browse/JS2-925
- this fix solves the last TCK issue and Jetspeed now passes all JSR-286 TCK tests
"Houston: we're JSR-286 compliant!" :)
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java?rev=759970&r1=759969&r2=759970&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java Mon Mar 30 13:56:25 2009
@@ -130,9 +130,9 @@
{
Map.Entry<QName, String[]> entry = iter.next();
ValuesAndWindowUsage vawu = publicRenderParametersMap.get(entry.getKey());
- if (vawu != null && changedParameterValues(entry.getValue(), vawu.getValues()))
+ if (vawu == null || changedParameterValues(entry.getValue(), vawu.getValues()))
{
- if (vawu.getWindowIds() != null)
+ if (vawu != null && vawu.getWindowIds() != null)
{
for (String windowId : vawu.getWindowIds())
{
@@ -147,6 +147,10 @@
{
iter.remove();
}
+ else if (vawu == null)
+ {
+ publicRenderParametersMap.put(entry.getKey(), new ValuesAndWindowUsage(entry.getValue()));
+ }
else
{
vawu.setValues(entry.getValue());
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org