You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2019/01/25 04:15:55 UTC
svn commit: r1852091 -
/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java
Author: rotty3000
Date: Fri Jan 25 04:15:54 2019
New Revision: 1852091
URL: http://svn.apache.org/viewvc?rev=1852091&view=rev
Log:
[CDI] references in container component are always Dependent to avoid any proxying
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java?rev=1852091&r1=1852090&r2=1852091&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ReferenceBean.java Fri Jan 25 04:15:54 2019
@@ -25,7 +25,6 @@ import java.util.Set;
import java.util.SortedMap;
import java.util.stream.Collectors;
-import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Dependent;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.Default;
@@ -199,12 +198,7 @@ public class ReferenceBean implements Be
@Override
public Class<? extends Annotation> getScope() {
if (_component.type == ComponentType.CONTAINER) {
- // is it optional?
- if ((_template.maximumCardinality == MaximumCardinality.ONE) &&
- (_template.minimumCardinality == 0)) {
- return Dependent.class;
- }
- return ApplicationScoped.class;
+ return Dependent.class;
}
return ComponentScoped.class;
}