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 2014/11/20 21:11:20 UTC
tomee git commit: ResourceContext in CDI
Repository: tomee
Updated Branches:
refs/heads/develop 23e40ce89 -> 05ced8865
ResourceContext in CDI
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/05ced886
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/05ced886
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/05ced886
Branch: refs/heads/develop
Commit: 05ced8865f4aeaabf239512f0caf801b45776ac2
Parents: 23e40ce
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Thu Nov 20 21:10:46 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Thu Nov 20 21:10:46 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/05ced886/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
index 309c536..2400798 100644
--- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
+++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
@@ -45,6 +45,7 @@ import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.container.ResourceContext;
import javax.ws.rs.container.ResourceInfo;
import javax.ws.rs.core.Configuration;
import javax.ws.rs.core.Context;
@@ -143,6 +144,9 @@ public class CxfRSService extends RESTService {
if (!hasBean(beanManagerImpl, ResourceInfo.class)) {
beanManagerImpl.addInternalBean(new ContextBean<>(ResourceInfo.class, ThreadLocalContextManager.RESOURCE_INFO));
}
+ if (!hasBean(beanManagerImpl, ResourceContext.class)) {
+ beanManagerImpl.addInternalBean(new ContextBean<>(ResourceContext.class, ThreadLocalContextManager.RESOURCE_CONTEXT));
+ }
beanManagerImpl.getInjectionResolver().clearCaches(); // hasBean() usage can have cached several things
}