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 2012/09/17 23:56:43 UTC
svn commit: r1386866 -
/openejb/branches/openejb-4.1.0/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Author: rmannibucau
Date: Mon Sep 17 21:56:42 2012
New Revision: 1386866
URL: http://svn.apache.org/viewvc?rev=1386866&view=rev
Log:
using right owb context for jaxrs
Modified:
openejb/branches/openejb-4.1.0/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
Modified: openejb/branches/openejb-4.1.0/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-4.1.0/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1386866&r1=1386865&r2=1386866&view=diff
==============================================================================
--- openejb/branches/openejb-4.1.0/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java (original)
+++ openejb/branches/openejb-4.1.0/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java Mon Sep 17 21:56:42 2012
@@ -99,7 +99,13 @@ public abstract class RESTService implem
final ClassLoader classLoader = getClassLoader(webContext.getClassLoader());
final Collection<Injection> injections = webContext.getInjections();
- final WebBeansContext owbCtx = webContext.getAppContext().getWebBeansContext();
+ final WebBeansContext owbCtx;
+ if (webContext.getWebbeansContext() != null) {
+ owbCtx = webContext.getWebbeansContext();
+ } else {
+ owbCtx = webContext.getAppContext().getWebBeansContext();
+ }
+
Context context = webContext.getJndiEnc();
if (context == null) { // usually true since it is set in org.apache.tomee.catalina.TomcatWebAppBuilder.afterStart() and lookup(comp) fails
context = webContext.getAppContext().getAppJndiContext();