You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/01/26 22:47:05 UTC
[2/2] tomee git commit: we just handle our reference in our IvmContext
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/0ee52009
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0ee52009
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0ee52009
Branch: refs/heads/develop
Commit: 0ee5200903bae523760bb70927e468f476f4c166
Parents: 8817e9d
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Jan 26 22:40:59 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Jan 26 22:40:59 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/assembler/classic/Assembler.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/0ee52009/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 40d33d8..feac0a1 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
@@ -150,7 +150,6 @@ import org.apache.webbeans.spi.api.ResourceReference;
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;
@@ -3039,7 +3038,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;
@@ -3063,7 +3062,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;
}