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 2018/08/24 18:50:32 UTC
svn commit: r1838931 -
/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java
Author: rotty3000
Date: Fri Aug 24 18:50:32 2018
New Revision: 1838931
URL: http://svn.apache.org/viewvc?rev=1838931&view=rev
Log:
[CDI] fix regression
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java?rev=1838931&r1=1838930&r2=1838931&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java Fri Aug 24 18:50:32 2018
@@ -48,6 +48,7 @@ import org.osgi.framework.Constants;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.framework.wiring.BundleRequirement;
import org.osgi.framework.wiring.BundleWire;
import org.osgi.framework.wiring.BundleWiring;
import org.osgi.service.cdi.runtime.CDIComponentRuntime;
@@ -213,7 +214,15 @@ public class Activator extends AbstractE
Bundle providerWiringBundle = bundleWire.getProviderWiring().getBundle();
if (providerWiringBundle.equals(_bundleContext.getBundle())) {
- return true;
+ BundleRequirement requirement = bundleWire.getRequirement();
+ Map<String, Object> requirementAttributes = requirement.getAttributes();
+
+ @SuppressWarnings("unchecked")
+ List<String> beans = (List<String>)requirementAttributes.get(REQUIREMENT_BEANS_ATTRIBUTE);
+
+ if (beans != null && !beans.isEmpty()) {
+ return true;
+ }
}
}
}