Repository: tomee Updated Branches: refs/heads/master a319d9812 -> 1d0961513
useless cast Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1d096151 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1d096151 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1d096151 Branch: refs/heads/master Commit: 1d09615137838c64c9f8b5366b1f7836337ef051 Parents: a319d98 Author: Romain Manni-Bucau <[email protected]> Authored: Sun Mar 22 19:36:25 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Sun Mar 22 19:36:25 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/openejb/cdi/CdiAppContextsService.java | 2 +- tck/cdi-tomee/src/test/resources/failing.xml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/1d096151/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java index e6aa8b0..6966549 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java @@ -354,7 +354,7 @@ public class CdiAppContextsService extends AbstractContextsService implements Co requestContext.set(rq);// set thread local if (event != null && ServletRequestEvent.class.isInstance(event)) { final HttpServletRequest request = (HttpServletRequest) ServletRequestEvent.class.cast(event).getServletRequest(); - ((ServletRequestContext) rq).setServletRequest(request); + rq.setServletRequest(request); if (request != null) { webBeansContext.getBeanManagerImpl().fireEvent(request, InitializedLiteral.REQUEST); http://git-wip-us.apache.org/repos/asf/tomee/blob/1d096151/tck/cdi-tomee/src/test/resources/failing.xml ---------------------------------------------------------------------- diff --git a/tck/cdi-tomee/src/test/resources/failing.xml b/tck/cdi-tomee/src/test/resources/failing.xml index b7f05e4..ba27e96 100644 --- a/tck/cdi-tomee/src/test/resources/failing.xml +++ b/tck/cdi-tomee/src/test/resources/failing.xml @@ -23,9 +23,6 @@ --> <test name="CDI TCK"> <classes> - <!-- - ConversationFilterTest>Arquillian.run:164->testConversationBusy:133 expected [BusyConversationException] but found [500] - --> <class name="org.jboss.cdi.tck.tests.context.conversation.filter.ConversationFilterTest" /> </classes> </test>
