Revision: 1128
          http://stripes.svn.sourceforge.net/stripes/?rev=1128&view=rev
Author:   bengunter
Date:     2009-04-30 15:50:06 +0000 (Thu, 30 Apr 2009)

Log Message:
-----------
Fixed STS-681: @HttpCache is ignored when resolution comes from interceptor.

Modified Paths:
--------------
    
trunk/stripes/src/net/sourceforge/stripes/controller/HttpCacheInterceptor.java

Modified: 
trunk/stripes/src/net/sourceforge/stripes/controller/HttpCacheInterceptor.java
===================================================================
--- 
trunk/stripes/src/net/sourceforge/stripes/controller/HttpCacheInterceptor.java  
    2009-03-30 23:25:36 UTC (rev 1127)
+++ 
trunk/stripes/src/net/sourceforge/stripes/controller/HttpCacheInterceptor.java  
    2009-04-30 15:50:06 UTC (rev 1128)
@@ -71,7 +71,7 @@
     public Resolution intercept(ExecutionContext ctx) throws Exception {
         final ActionBean actionBean = ctx.getActionBean();
         final Method handler = ctx.getHandler();
-        if (ctx.isResolutionFromHandler() && (actionBean != null) && (handler 
!= null)) {
+        if (actionBean != null && handler != null) {
             final Class<? extends ActionBean> beanClass = 
actionBean.getClass();
             // if caching is disabled, then set the appropriate response 
headers
             logger.debug("Looking for ", HttpCache.class.getSimpleName(), " on 
", beanClass


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations 
Conference from O'Reilly Media. Velocity features a full day of 
expert-led, hands-on workshops and two days of sessions from industry 
leaders in dedicated Performance & Operations tracks. Use code vel09scf 
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development

Reply via email to