You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/11/02 18:15:14 UTC
[20/24] tomee git commit: in case of federation skip context lookup
in case of federation skip context lookup
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/7b1983cd
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/7b1983cd
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/7b1983cd
Branch: refs/heads/tomee-7.0.0-M1
Commit: 7b1983cdcf60a39e6d5d016252595f3e7cd8d27e
Parents: 796342a
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Mon Oct 26 11:17:03 2015 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Mon Oct 26 11:17:03 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/7b1983cd/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
index 46e6766..e57f7ab 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/NameNode.java
@@ -83,7 +83,7 @@ public class NameNode implements Serializable {
} catch (final NameNotFoundException e) {
n = e;
}
- } else if (!subTreeUnbound && !unbound && myContext != null) {
+ } else if (!subTreeUnbound && !unbound && myContext != null && !Federation.class.isInstance(myObject)) {
try {
return myContext.mynode.resolve(name);
} catch (final NameNotFoundException e) {