Revision: 464
          http://svn.sourceforge.net/stripes/?rev=464&view=rev
Author:   tfenne
Date:     2006-10-29 16:39:07 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
Merge of fix for STS-278 onto the 1.4 branch.

Modified Paths:
--------------
    
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/BeforeAfterMethodInterceptor.java

Modified: 
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/BeforeAfterMethodInterceptor.java
===================================================================
--- 
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/BeforeAfterMethodInterceptor.java
     2006-10-29 13:17:13 UTC (rev 463)
+++ 
branches/1.4.x/stripes/src/net/sourceforge/stripes/controller/BeforeAfterMethodInterceptor.java
     2006-10-30 00:39:07 UTC (rev 464)
@@ -108,16 +108,18 @@
 
         // Run After filter methods (if any)
         ActionBean bean = context.getActionBean();
-               FilterMethods filterMethods = getFilterMethods(bean.getClass());
-               List<Method> afterMethods = 
filterMethods.getAfterMethods(stage);
+        if (bean != null) {
+                       FilterMethods filterMethods = 
getFilterMethods(bean.getClass());
+                       List<Method> afterMethods = 
filterMethods.getAfterMethods(stage);
 
-        Resolution overrideResolution = null;
-        for (Method method : afterMethods) {
-            overrideResolution = invoke(bean, method, stage, After.class);
-            if (overrideResolution != null) {
-                return overrideResolution;
-            }
-        }
+               Resolution overrideResolution = null;
+               for (Method method : afterMethods) {
+                   overrideResolution = invoke(bean, method, stage, 
After.class);
+                   if (overrideResolution != null) {
+                       return overrideResolution;
+                   }
+               }
+               }
 
                return resolution;
        }


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

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development

Reply via email to