You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2015/03/11 12:56:56 UTC
[40/50] tomee git commit: local bean wins over local interface for cdi
local bean wins over local interface for cdi
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6d1cdf47
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6d1cdf47
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6d1cdf47
Branch: refs/heads/master
Commit: 6d1cdf47c327406fcc1f19bcc3f1fcef6467f0ee
Parents: 643ce4f
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Mar 6 19:18:51 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Mar 6 19:18:51 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/cdi/CdiEjbBean.java | 2 +-
tck/cdi-embedded/src/test/resources/failing.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6d1cdf47/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
index b11d079..b3a1702 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiEjbBean.java
@@ -300,7 +300,7 @@ public class CdiEjbBean<T> extends BaseEjbBean<T> implements InterceptedMarker,
homeLocalBean = null;
home = null;
remote = null;
- } else if (noLocalInterface && beanContext.isLocalbean()) {
+ } else if (beanContext.isLocalbean()) {
homeLocalBean = beanContext.getBusinessLocalBeanHome();
home = null;
remote = null;
http://git-wip-us.apache.org/repos/asf/tomee/blob/6d1cdf47/tck/cdi-embedded/src/test/resources/failing.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/src/test/resources/failing.xml b/tck/cdi-embedded/src/test/resources/failing.xml
index e32235d..b0a5663 100644
--- a/tck/cdi-embedded/src/test/resources/failing.xml
+++ b/tck/cdi-embedded/src/test/resources/failing.xml
@@ -31,7 +31,7 @@
-Dopenejb.embedded.try-jsp=true
-->
<classes>
- <class name="org.jboss.cdi.tck.tests.context.application.ejb.ApplicationContextSharedTest" />
+ <class name="org.jboss.cdi.tck.tests.lookup.modules.SpecializedBeanInjectionNotAvailable02Test" />
</classes>
</test>
</suite>