Actually disable session context at end of request

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2748 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jun 3, 2009 · 4a9c10f · 4a9c10f
1 parent fa89128
commit 4a9c10f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java b/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java
@@ -26,6 +26,7 @@
 
 import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.bootstrap.api.Service;
+import org.jboss.webbeans.context.api.BeanStore;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
 
@@ -59,5 +60,17 @@ public String toString()
       String beanStoreInfo = getBeanStore() == null ? "" : getBeanStore().toString();
       return active + "session context " + beanStoreInfo;
    }
+
+   @Override
+   public void setActive(boolean active)
+   {
+      super.setActive(active);
+   }
+
+   @Override
+   public void setBeanStore(BeanStore beanStore)
+   {
+      super.setBeanStore(beanStore);
+   }
 
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java b/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
@@ -153,6 +153,7 @@ public void endRequest(HttpServletRequest request)
          }
          lifecycle.endRequest(request.getRequestURI(), beanStore);
          request.removeAttribute(REQUEST_ATTRIBUTE_NAME);
+         SessionContext.instance().setActive(false);
          SessionContext.instance().setBeanStore(null);
       }
    }