You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/04/12 10:32:02 UTC
tomee git commit: another test fix
Repository: tomee
Updated Branches:
refs/heads/master 466e9cf55 -> a4cecde17
another test fix
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a4cecde1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a4cecde1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a4cecde1
Branch: refs/heads/master
Commit: a4cecde17497aec2074466d235eb3c075532bd46
Parents: 466e9cf
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun Apr 12 10:31:56 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun Apr 12 10:31:56 2015 +0200
----------------------------------------------------------------------
.../server/cxf/rs/CDIProviderContainerRequestFilterTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a4cecde1/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIProviderContainerRequestFilterTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIProviderContainerRequestFilterTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIProviderContainerRequestFilterTest.java
index 6c1802c..caf0319 100644
--- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIProviderContainerRequestFilterTest.java
+++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CDIProviderContainerRequestFilterTest.java
@@ -79,7 +79,9 @@ public class CDIProviderContainerRequestFilterTest {
@Override
public void filter(final ContainerRequestContext request) throws IOException {
- request.abortWith(Response.ok(bean.user() + "@" + resourceInfo.getResourceMethod().getName()).build());
+ if (bean != null) { // EJBContainer tests
+ request.abortWith(Response.ok(bean.user() + "@" + resourceInfo.getResourceMethod().getName()).build());
+ }
}
}
}