[jboss-svn-commits] JBoss Portal SVN: r5614 - trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet

[jboss-svn-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2006-11-09 12:55:39 -0500 (Thu, 09 Nov 2006)
New Revision: 5614

Modified:
   trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java
Log:
update consumer caching to rely on the window id provided from the window context instead of the portlet id

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java	2006-11-09 17:46:57 UTC (rev 5613)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java	2006-11-09 17:55:39 UTC (rev 5614)
@@ -30,7 +30,6 @@
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
 import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.ParametersStateString;
 import org.jboss.portal.portlet.spi.RenderContext;
 import org.jboss.portal.common.invocation.InvocationException;
@@ -47,12 +46,10 @@
 public class ConsumerCacheInterceptor extends PortletInterceptor
 {
 
-
    protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException
    {
       // Compute the cache key
-      PortletContext ctx = (PortletContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PORTLET_CONTEXT_ATTRIBUTE);
-      String scopeKey = "cached_markup." + ctx.getId();
+      String scopeKey = "cached_markup." + invocation.getWindowContext().getId();
 
       // We use the principal scope to avoid security issues like a user loggedout seeing a cached entry
       // by a previous logged in user