You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2015/03/11 12:56:58 UTC

[42/50] tomee git commit: java: handling in ContextHandler

java: handling in ContextHandler


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b3ee6c93
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b3ee6c93
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b3ee6c93

Branch: refs/heads/master
Commit: b3ee6c9326e9e60835fe748c2cf9b98baa03aa5a
Parents: 8f30ba2
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Mar 6 22:56:53 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Mar 6 22:56:53 2015 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/openejb/core/ivm/ContextHandler.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/b3ee6c93/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
index b86aa9b..c24c178 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/ContextHandler.java
@@ -51,6 +51,9 @@ public class ContextHandler extends ContextWrapper {
     @Override
     public Object lookup(final String name) throws NamingException {
         try {
+            if ("java:".equals(name)) {
+                return context;
+            }
             return context.lookup(name);
         } catch (final UndeclaredThrowableException ute) {
             Throwable e = ute.getUndeclaredThrowable();