Author: rmannibucau
Date: Fri May 17 14:39:23 2013
New Revision: 1483831
URL: http://svn.apache.org/r1483831
Log:
OPENEJB-2025 when no ThreadContext is present trying to use XContext jndi enc
first
Added:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java?rev=1483831&r1=1483830&r2=1483831&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
Fri May 17 14:39:23 2013
@@ -28,8 +28,8 @@ import org.apache.openejb.core.cmp.KeyGe
import org.apache.openejb.core.interceptor.InterceptorData;
import org.apache.openejb.core.interceptor.InterceptorInstance;
import org.apache.openejb.core.interceptor.InterceptorStack;
+import org.apache.openejb.core.ivm.ContextHandler;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
-import org.apache.openejb.core.ivm.naming.ContextWrapper;
import org.apache.openejb.core.timer.EjbTimerService;
import org.apache.openejb.core.timer.EjbTimerServiceImpl;
import org.apache.openejb.core.transaction.EjbTransactionUtil;
@@ -37,7 +37,6 @@ import org.apache.openejb.core.transacti
import org.apache.openejb.core.transaction.TransactionPolicyFactory;
import org.apache.openejb.core.transaction.TransactionType;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.spi.ContainerSystem;
import org.apache.openejb.util.Duration;
import org.apache.openejb.util.Index;
import org.apache.openejb.util.LogCategory;
@@ -68,9 +67,6 @@ import javax.enterprise.context.spi.Crea
import javax.enterprise.inject.spi.Decorator;
import javax.enterprise.inject.spi.Interceptor;
import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
import javax.persistence.EntityManagerFactory;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationHandler;
@@ -1782,39 +1778,4 @@ public class BeanContext extends Deploym
private Class localInterface;
private Method createMethod;
}
-
- private static class ContextHandler extends ContextWrapper {
-
- public ContextHandler(final Context jndiContext) {
- super(jndiContext);
- }
-
- @Override
- public Object lookup(final Name name) throws NamingException {
- try {
- return context.lookup(name);
- } catch (NameNotFoundException nnfe) {
- try {
- return
SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext().lookup(name);
- } catch (NameNotFoundException nnfe2) {
- // ignore, let it be thrown
- }
- throw nnfe;
- }
- }
-
- @Override
- public Object lookup(String name) throws NamingException {
- try {
- return context.lookup(name);
- } catch (NameNotFoundException nnfe) {
- try {
- return
SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext().lookup(name);
- } catch (NameNotFoundException nnfe2) {
- // ignore, let it be thrown
- }
- throw nnfe;
- }
- }
- }
}
Added:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java?rev=1483831&view=auto
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
(added)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
Fri May 17 14:39:23 2013
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core.ivm;
+
+import org.apache.openejb.core.ivm.naming.ContextWrapper;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.ContainerSystem;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+
+public class ContextHandler extends ContextWrapper {
+ public ContextHandler(final Context jndiContext) {
+ super(jndiContext);
+ }
+
+ @Override
+ public Object lookup(final Name name) throws NamingException {
+ try {
+ return context.lookup(name);
+ } catch (NameNotFoundException nnfe) {
+ try {
+ return
SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext().lookup(name);
+ } catch (NameNotFoundException nnfe2) {
+ // ignore, let it be thrown
+ }
+ throw nnfe;
+ }
+ }
+
+ @Override
+ public Object lookup(String name) throws NamingException {
+ try {
+ return context.lookup(name);
+ } catch (NameNotFoundException nnfe) {
+ try {
+ return
SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext().lookup(name);
+ } catch (NameNotFoundException nnfe2) {
+ // ignore, let it be thrown
+ }
+ throw nnfe;
+ }
+ }
+}
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java?rev=1483831&r1=1483830&r2=1483831&view=diff
==============================================================================
---
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
(original)
+++
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/java/javaURLContextFactory.java
Fri May 17 14:39:23 2013
@@ -16,17 +16,21 @@
*/
package org.apache.openejb.core.ivm.naming.java;
-import java.util.Hashtable;
+import org.apache.openejb.AppContext;
+import org.apache.openejb.BeanContext;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.WebContext;
+import org.apache.openejb.core.ivm.ContextHandler;
+import org.apache.openejb.core.ivm.naming.ContextWrapper;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.ContainerSystem;
import javax.naming.Context;
import javax.naming.Name;
+import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import javax.naming.spi.ObjectFactory;
-
-import org.apache.openejb.BeanContext;
-import org.apache.openejb.core.ThreadContext;
-import org.apache.openejb.spi.ContainerSystem;
-import org.apache.openejb.loader.SystemInstance;
+import java.util.Hashtable;
public class javaURLContextFactory implements ObjectFactory {
@@ -35,10 +39,27 @@ public class javaURLContextFactory imple
}
public static Context getContext() {
- ThreadContext callContext = ThreadContext.getThreadContext();
+ final ThreadContext callContext = ThreadContext.getThreadContext();
if (callContext == null) {
- ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
- return containerSystem.getJNDIContext();
+ final ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
+ final ClassLoader current =
Thread.currentThread().getContextClassLoader();
+ final Context globalContext = containerSystem.getJNDIContext();
+ if (current == null) {
+ return globalContext;
+ }
+
+ for (final AppContext appContext :
containerSystem.getAppContexts()) {
+ for (final WebContext web : appContext.getWebContexts()) { //
more specific first
+ if (current.equals(web.getClassLoader())) {
+ return new ContextHandler(web.getJndiEnc());
+ }
+ }
+ if (current.equals(appContext.getClassLoader())) {
+ return new ContextHandler(appContext.getAppJndiContext());
+ }
+ }
+
+ return globalContext;
}
BeanContext di = callContext.getBeanContext();
@@ -49,4 +70,38 @@ public class javaURLContextFactory imple
return containerSystem.getJNDIContext();
}
}
+
+ private static class ContextWithglobalFallbackWrapper extends
ContextWrapper {
+ public ContextWithglobalFallbackWrapper(final Context first) {
+ super(first);
+ }
+
+ @Override
+ public Object lookup(final Name name) throws NamingException {
+ try {
+ return super.lookup(name);
+ } catch (final NameNotFoundException nnfe) {
+ try {
+ return
SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext().lookup(name);
+ } catch (NameNotFoundException nnfe2) {
+ // ignore, let it be thrown
+ }
+ throw nnfe;
+ }
+ }
+
+ @Override
+ public Object lookup(String name) throws NamingException {
+ try {
+ return super.lookup(name);
+ } catch (NameNotFoundException nnfe) {
+ try {
+ return
SystemInstance.get().getComponent(ContainerSystem.class).getJNDIContext().lookup(name);
+ } catch (final NameNotFoundException nnfe2) {
+ // ignore, let it be thrown
+ }
+ throw nnfe;
+ }
+ }
+ }
}
