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 2011/05/13 17:47:48 UTC

svn commit: r1102799 - /portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java

Author: ate
Date: Fri May 13 15:47:47 2011
New Revision: 1102799

URL: http://svn.apache.org/viewvc?rev=1102799&view=rev
Log:
JS2-1183: ensure DecorationActions resources map ThreadLocal is cleared after (request) usage

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java?rev=1102799&r1=1102798&r2=1102799&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java Fri May 13 15:47:47 2011
@@ -35,6 +35,7 @@ import org.apache.jetspeed.om.portlet.Po
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.security.SecurityAccessController;
+import org.apache.jetspeed.util.ServletRequestThreadLocalCleanupCallback;
 
 public abstract class AbstractDecoratorActionsFactory implements DecoratorActionsFactory
 {
@@ -188,6 +189,7 @@ public abstract class AbstractDecoratorA
         {
             resourcesMap = new HashMap<String, Object>();
             actionResourcesMap.set(resourcesMap);
+            new ServletRequestThreadLocalCleanupCallback(actionResourcesMap);
             resourcesMap.put(DecoratorAction.RESOURCE_BUNDLE, bundle);
             localizedName = DecoratorAction.getResourceString(bundle, actionName, actionName);
             resourcesMap.put(actionName,localizedName);



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org