Fix Tomcat crossContext

stripes/src/main/java/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java

@@ -370,21 +370,24 @@ public ActionBean getActionBean(ActionBeanContext context, String path) throws S
         }
 
         String bindingPath = getUrlBinding(beanClass);
+        final String contextPath = context.getServletContext().getContextPath() != null ?
+                context.getServletContext().getContextPath() : "";
+        final String attribName = contextPath + bindingPath;
         try {
             HttpServletRequest request = context.getRequest();
 
             if (beanClass.isAnnotationPresent(SessionScope.class)) {
-                bean = (ActionBean) request.getSession().getAttribute(bindingPath);
+                bean = (ActionBean) request.getSession().getAttribute(attribName);
 
                 if (bean == null) {
                     bean = makeNewActionBean(beanClass, context);
-                    request.getSession().setAttribute(bindingPath, bean);
+                    request.getSession().setAttribute(attribName, bean);
                 }
             } else {
-                bean = (ActionBean) request.getAttribute(bindingPath);
+                bean = (ActionBean) request.getAttribute(attribName);
                 if (bean == null) {
                     bean = makeNewActionBean(beanClass, context);
-                    request.setAttribute(bindingPath, bean);
+                    request.setAttribute(attribName, bean);
                 }
             }
 

stripes/src/main/java/net/sourceforge/stripes/controller/DispatcherServlet.java

@@ -375,6 +375,8 @@ protected void restoreActionBean(HttpServletRequest request) {
         Stack<ActionBean> stack = getActionBeanStack(request, false);
         if (stack != null && !stack.empty()) {
             request.setAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN, stack.pop());
+        } else {
+            request.removeAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN);
         }
     }
 }

stripes/src/main/java/net/sourceforge/stripes/controller/StripesConstants.java

@@ -65,6 +65,12 @@ public interface StripesConstants {
      */
     String REQ_ATTR_ACTION_BEAN = "actionBean";
 
+    /**
+     * The name under which the last ActionBean for a request is stored before restoring from
+     * the stack.
+     */
+    String REQ_ATTR_LAST_ACTION_BEAN = "lastActionBean";
+
     /**
      * The name of a request attribute in which a Stack of action beans is some times stored
      * when a single request involves includes of action beans.

stripes/src/main/java/net/sourceforge/stripes/mock/MockRoundtrip.java

@@ -274,9 +274,12 @@ public void execute(String event) throws Exception {
      */
     @SuppressWarnings("unchecked")
 	public <A extends ActionBean> A getActionBean(Class<A> type) {
-        A bean = (A) this.request.getAttribute(getUrlBinding(type, this.context));
+        final String bindingPath = getUrlBinding(type, this.context);
+        final String contextPath = context.getContextPath() != null ? context.getContextPath() : "";
+        final String attribName = contextPath + bindingPath;
+        A bean = (A) this.request.getAttribute(attribName);
         if (bean == null) {
-            bean = (A) this.request.getSession().getAttribute(getUrlBinding(type, this.context));
+            bean = (A) this.request.getSession().getAttribute(attribName);
         }
         return bean;
     }
@@ -285,7 +288,7 @@ public <A extends ActionBean> A getActionBean(Class<A> type) {
      * Gets the (potentially empty) set of Validation Errors that were produced by the request.
      */
     public ValidationErrors getValidationErrors() {
-        ActionBean bean = (ActionBean) this.request.getAttribute(StripesConstants.REQ_ATTR_ACTION_BEAN);
+        ActionBean bean = (ActionBean) this.request.getAttribute(StripesConstants.REQ_ATTR_LAST_ACTION_BEAN);
         return bean.getContext().getValidationErrors();
     }
 

stripes/src/test/java/net/sourceforge/stripes/StripesTestFixture.java

@@ -55,6 +55,7 @@ public static synchronized Configuration getDefaultConfiguration() {
     public static Map<String, String> getDefaultFilterParams() {
         Map<String, String> map = new HashMap<String, String>();
         map.put("ActionResolver.Packages", "net.sourceforge.stripes");
+        map.put("Interceptor.Classes", "net.sourceforge.stripes.test.RecordLastActionBeanInterceptor");
         map.put("LocalePicker.Class", "net.sourceforge.stripes.localization.MockLocalePicker");
         return map;
     }

stripes/src/test/java/net/sourceforge/stripes/test/RecordLastActionBeanInterceptor.java

@@ -0,0 +1,18 @@
+package net.sourceforge.stripes.test;
+
+import net.sourceforge.stripes.action.Resolution;
+import net.sourceforge.stripes.controller.*;
+
+/**
+ * Created by shane on 23/9/16.
+ */
+@Intercepts(LifecycleStage.RequestComplete)
+public class RecordLastActionBeanInterceptor implements Interceptor {
+
+    @Override
+    public Resolution intercept(ExecutionContext context) throws Exception {
+        context.getActionBeanContext().getRequest().setAttribute(StripesConstants.REQ_ATTR_LAST_ACTION_BEAN, context.getActionBean());
+        return null;
+    }
+
+}