we just handle our reference in our IvmContext
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/efbb9965 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/efbb9965 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/efbb9965 Branch: refs/heads/tomee-1.7.x Commit: efbb99651b8597b8923a83699a11d851aef38d8e Parents: c13aae8 Author: Romain Manni-Bucau <[email protected]> Authored: Mon Jan 26 22:41:08 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Mon Jan 26 22:41:08 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/openejb/assembler/classic/Assembler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/efbb9965/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java index 90b1101..9791e3b 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java @@ -77,6 +77,7 @@ import org.apache.openejb.core.ivm.IntraVmProxy; import org.apache.openejb.core.ivm.naming.ContextualJndiReference; import org.apache.openejb.core.ivm.naming.IvmContext; import org.apache.openejb.core.ivm.naming.IvmJndiFactory; +import org.apache.openejb.core.ivm.naming.Reference; import org.apache.openejb.core.security.SecurityContextHandler; import org.apache.openejb.core.timer.EjbTimerServiceImpl; import org.apache.openejb.core.timer.MemoryTimerStore; @@ -142,7 +143,6 @@ import org.apache.webbeans.spi.adaptor.ELAdaptor; import org.apache.xbean.finder.ClassLoaders; import org.apache.xbean.finder.ResourceFinder; import org.apache.xbean.finder.UrlSet; -import org.apache.xbean.naming.reference.SimpleReference; import org.apache.xbean.recipe.ObjectRecipe; import org.apache.xbean.recipe.Option; import org.apache.xbean.recipe.UnsetPropertiesRecipe; @@ -2941,7 +2941,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } } - public static final class ResourceAdapterReference extends SimpleReference { + public static final class ResourceAdapterReference extends Reference { private transient ResourceAdapter ra; private transient Executor pool; private final String jndi; @@ -2965,7 +2965,7 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } @Override - public Object getContent() throws NamingException { + public Object getObject() throws NamingException { return ra; }
