remove undeploy exceptions, fix remaining incontainer tests

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1699 1c488680-804c-0410-94cd-c6b725194a0e
weld · Feb 25, 2009 · 2802b75 · 2802b75
1 parent 902bf31
commit 2802b75
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/AbstractLifecycle.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/AbstractLifecycle.java
@@ -88,6 +88,7 @@ protected void beginSession(String id, BeanStore sessionBeanStore)
    protected void endSession(String id, BeanStore sessionBeanStore)
    {
       log.trace("Ending session " + id);
+      SessionContext.INSTANCE.setActive(true);
       ConversationManager conversationManager = CurrentManager.rootManager().getInstanceByType(ConversationManager.class);
       conversationManager.destroyAllConversations();
       SessionContext.INSTANCE.destroy();

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionManager.java
@@ -19,7 +19,6 @@ public void setSession(HttpSession session)
 
    @Produces
    @RequestScoped
-   @WebBean
    public HttpSession getSession()
    {
       return session;

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java b/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
@@ -103,7 +103,10 @@ public void beginSession(HttpSession session)
     */
    public void endSession(HttpSession session)
    {
+      BeanStore mockRequest = new SimpleBeanStore();
+      super.beginRequest("endSession-" + session.getId(), mockRequest);
       super.endSession(session.getId(), restoreSessionContext(session));
+      super.endRequest("endSession-" + session.getId(), mockRequest);
    }
 
    /**