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/04/14 22:57:40 UTC
tomee git commit: auto link only for comp for default resources -
surely to enhance
Repository: tomee
Updated Branches:
refs/heads/master 91fd4dbfb -> 4606f67cc
auto link only for comp for default resources - surely to enhance
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4606f67c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4606f67c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4606f67c
Branch: refs/heads/master
Commit: 4606f67cc8153a5d3eb81ed0a25bec6d9bdf9f3f
Parents: 91fd4db
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Apr 14 22:57:28 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Apr 14 22:57:28 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/config/AutoConfig.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4606f67c/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index 0c3c60d..dbee1f5 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -17,6 +17,7 @@
package org.apache.openejb.config;
+import org.apache.openejb.BeanContext;
import org.apache.openejb.JndiConstants;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.assembler.classic.ContainerInfo;
@@ -862,6 +863,10 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
// Resource env reference
for (final JndiReference ref : bean.getResourceEnvRef()) {
+ final String name = ref.getName();
+ if (name != null && name.startsWith("java:comp/Default") && !BeanContext.Comp.class.getName().equals(bean.getEjbClass())) {
+ return; // all default resources will be available thanks to Comp bean, far enough for what it provides!
+ }
processResourceEnvRef(ref, ejbDeployment, appResources, ejbModule.getClassLoader());
}