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 vk...@apache.org on 2009/03/04 14:45:00 UTC
svn commit: r750005 -
/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
Author: vkumar
Date: Wed Mar 4 13:45:00 2009
New Revision: 750005
URL: http://svn.apache.org/viewvc?rev=750005&view=rev
Log:
Apply patch for issue https://issues.apache.org/jira/browse/JS2-931
Thanks Joachim Müller for the patch.
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java?rev=750005&r1=750004&r2=750005&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java Wed Mar 4 13:45:00 2009
@@ -17,6 +17,7 @@
package org.apache.jetspeed.container.state.impl;
import java.io.Serializable;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -36,7 +37,7 @@
{
private static final class PageState implements Serializable
{
- public Map windowStates = new HashMap();
+ public Map windowStates = Collections.synchronizedMap(new HashMap());
public String maximizedWindowId;
}
@@ -76,7 +77,7 @@
removeFromCache(context, pageState.maximizedWindowId, decorationCache);
pageState.maximizedWindowId = null;
}
-
+ synchronized (pageState.windowStates){
Iterator iter = requestStates.getWindowIdIterator();
iter = pageState.windowStates.keySet().iterator();
String windowId;
@@ -117,7 +118,8 @@
}
}
- }
+ }
+ }
}
public void sync(RequestContext context, Page page, PortletWindowRequestNavigationalStates requestStates, JetspeedContentCache cache, JetspeedContentCache decorationCache)
@@ -226,7 +228,8 @@
}
}
}
-
+ synchronized (pageState.windowStates)
+ {
// now copy missing requestStates from the pageState
iter = pageState.windowStates.keySet().iterator();
String windowId;
@@ -249,7 +252,8 @@
}
}
}
- }
+ }
+ }
}
private boolean modeChanged(PortletMode req, PortletMode ses)
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org