avoid class cast exception if we are not a context
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/56d7ae4f Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/56d7ae4f Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/56d7ae4f Branch: refs/heads/tomee-7.0.0-M1 Commit: 56d7ae4f89d1491875438afa223eb931213674bf Parents: 23cc857 Author: Romain Manni-Bucau <rmann...@gmail.com> Authored: Sun Oct 18 19:14:49 2015 +0200 Committer: Romain Manni-Bucau <rmann...@gmail.com> Committed: Sun Oct 18 19:14:49 2015 +0200 ---------------------------------------------------------------------- .../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/56d7ae4f/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 73f1326..cb728e1 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 @@ -82,7 +82,7 @@ public class NameNode implements Serializable { } catch (final NameNotFoundException e) { n = e; } - } else if (!unbound) { + } else if (!unbound && myObject == null) { try { return IvmContext.class.cast(getBinding()).mynode.resolve(name); } catch (final NameNotFoundException e) {
