Branch: refs/heads/2.0 Home: https://github.com/weld/core Commit: 6f2c92bd5ca8d258e64f56fa488471b528987064 https://github.com/weld/core/commit/6f2c92bd5ca8d258e64f56fa488471b528987064 Author: Max Pimm <maxmil(a)gmail.com&gt; Date: 2013-07-23 (Tue, 23 Jul 2013) Changed paths: A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/ConversationTimeoutTest.java A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/TimeoutBean.java A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/TimeoutConversationScopedBean.java A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/TimeoutFilter.java A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/TimeoutServlet.java A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/timeout/web.xml Log Message: ----------- Implemented tests for WELD-1452 based on tests by Marko Luksa Commit: 4c5945b669fc87e89be35ecda4047741ae35e14e https://github.com/weld/core/commit/4c5945b669fc87e89be35ecda4047741ae35e14e Author: Max Pimm <maxmil(a)gmail.com&gt; Date: 2013-07-23 (Tue, 23 Jul 2013) Changed paths: M impl/src/main/java/org/jboss/weld/context/AbstractConversationContext.java Log Message: ----------- Resolves WELD-1452 Do not allow activation of expired conversations. Make sure that the current conversation, once activated, will not be invalidated and will therefore be touched when it is disactivated. Compare: https://github.com/weld/core/compare/502a0ccb1de2...4c5945b669fc