[weld-commits] [weld/core] e4d19b: WELD-1657 Backport WELD-1452

[GitHub]

  Branch: refs/heads/eap6.2.x
  Home:   https://github.com/weld/core
  Commit: e4d19b75667e971a8928501724220b7cb52199c8
      https://github.com/weld/core/commit/e4d19b75667e971a8928501724220b7cb52199c8
  Author: Martin Kouba <mkouba at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M impl/src/main/java/org/jboss/weld/context/AbstractConversationContext.java
    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/TimeoutController.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/resources/org/jboss/weld/tests/contexts/conversation/timeout/faces-config.xml
    A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/timeout/form.xhtml
    A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/timeout/test.xhtml
    A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/timeout/web.xml

  Log Message:
  -----------
  WELD-1657 Backport WELD-1452
WELD-1315 Don't try to restore the long-running conversation if cid
param is empty


  Commit: 6037a1df5271debe50db28bf94ebb682a65103bf
      https://github.com/weld/core/commit/6037a1df5271debe50db28bf94ebb682a65103bf
  Author: Ron Smeral <rsmeral at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/ConversationTimeoutTest.java

  Log Message:
  -----------
  Fix ConversationTimeoutTest to show test failures instead of test errors


  Commit: 4bfd80ad7625aa16cf4444e53dca15b18f8b8dbd
      https://github.com/weld/core/commit/4bfd80ad7625aa16cf4444e53dca15b18f8b8dbd
  Author: Ron Smeral <rsmeral at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/ConversationTimeoutTest.java
    M tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/TimeoutController.java
    M tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/TimeoutFilter.java
    M tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/timeout/form.xhtml

  Log Message:
  -----------
  Make ConversationTimeoutTest more robust


Compare: https://github.com/weld/core/compare/bee308fb656f...4bfd80ad7625