Author: chris.laprun(a)jboss.com Date: 2007-05-23 17:04:54 -0400 (Wed, 23 May 2007) New Revision: 7316 Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml Log: - Use FragmentResponse expiration instead of portlet metadata for cache info for better accuracy. Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java =================================================================== --- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2007-05-23 15:49:45 UTC (rev 7315) +++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2007-05-23 21:04:54 UTC (rev 7316) @@ -23,11 +23,10 @@ package org.jboss.portal.wsrp.producer; +import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.impl.jsr168.PortletUtils; -import org.jboss.portal.portlet.info.CacheInfo; import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; @@ -159,15 +158,17 @@ markupContext.setPreferredTitle(portletDescription.getTitle().getValue()); // cache information - CacheInfo cacheInfo = portlet.getInfo().getCache(); - if (cacheInfo != null) + int expires = fragment.getExpirationSecs(); + // only create a CacheControl if expiration time is not 0 + if (expires != 0) { - int expires = cacheInfo.getExpirationSecs(); - // only create a CacheControl if expiration time is not 0 - if (expires != 0) + // if expires is negative, replace by -1 to make sure + if (expires < 0) { - markupContext.setCacheControl(WSRPTypeFactory.createCacheControl(expires, WSRPConstants.CACHE_PER_USER)); + expires = -1; } + + markupContext.setCacheControl(WSRPTypeFactory.createCacheControl(expires, WSRPConstants.CACHE_PER_USER)); } return new MarkupResponse(markupContext, null, null); Modified: trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml =================================================================== --- trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-05-23 15:49:45 UTC (rev 7315) +++ trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-05-23 21:04:54 UTC (rev 7316) @@ -35,6 +35,7 @@ <depends-list-element>portal:service=Interceptor,type=Portlet,name=ContextDispatcher</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=WindowStates</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Portlet,name=Modes</depends-list-element> + <depends-list-element>portal:service=Interceptor,type=Portlet,name=ProducerCache</depends-list-element> </depends-list> </mbean>