Author: pete.muir(a)jboss.org Date: 2010-05-21 17:55:46 -0400 (Fri, 21 May 2010) New Revision: 6276 Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java Log: put conversation stuff in the same place Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java 2010-05-21 21:54:29 UTC (rev 6275) +++ core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java 2010-05-21 21:55:46 UTC (rev 6276) @@ -325,9 +325,15 @@ activateConversationContext(); } + /** + * Tear down the conversation context. If the context is already destroyed, does nothing + */ public void teardownConversationContext() { - destroyConversationContext(); + if (getConversationContext().getBeanStore() != null) + { + destroyConversationContext(); + } } public boolean isSessionContextActive() Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java 2010-05-21 21:54:29 UTC (rev 6275) +++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java 2010-05-21 21:55:46 UTC (rev 6276) @@ -197,6 +197,10 @@ private void teardownConversation() { conversationManager(getServletContext()).teardownConversation(); + if (isSessionBeanStoreInvalid(getSessionBeanStore())) + { + conversationManager(getServletContext()).teardownContext(); + } } private ServletContext getServletContext() @@ -209,7 +213,6 @@ HttpPassThruSessionBeanStore sessionBeanStore = getSessionBeanStore(); if (isSessionBeanStoreInvalid(sessionBeanStore)) { - conversationManager(getServletContext()).teardownContext(); lifecycle.endSession(request.getRequestedSessionId(), sessionBeanStore); } lifecycle.deactivateSessionContext();