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/24 21:23:01 UTC
svn commit: r1852074 -
/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java
Author: rotty3000
Date: Thu Jan 24 21:23:01 2019
New Revision: 1852074
URL: http://svn.apache.org/viewvc?rev=1852074&view=rev
Log:
[CDI] missing the default descriptor file check
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java?rev=1852074&r1=1852073&r2=1852074&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java Thu Jan 24 21:23:01 2019
@@ -53,6 +53,14 @@ public class BeansModelBuilder {
List<String> beanDescriptorPaths = cast(attributes.get(REQUIREMENT_DESCRIPTOR_ATTRIBUTE));
+ if (beanDescriptorPaths == null) {
+ beanDescriptorPaths = new ArrayList<>();
+ }
+
+ if (beanDescriptorPaths.isEmpty()) {
+ beanDescriptorPaths.add("META-INF/beans.xml");
+ }
+
if (beanDescriptorPaths != null) {
for (String descriptorPath : beanDescriptorPaths) {
URL url = getResource(descriptorPath);