Author: struberg
Date: Mon May 29 19:07:41 2017
New Revision: 1796675
URL: http://svn.apache.org/viewvc?rev=1796675&view=rev
Log:
OWB-1182 improve Instance handling
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
openwebbeans/trunk/webbeans-tck/standalone-suite.xml
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=1796675&r1=1796674&r2=1796675&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
Mon May 29 19:07:41 2017
@@ -214,10 +214,13 @@ public class InstanceImpl<T> implements
{
sub = injectionClazz;
}
-
- //X Annotation[] newQualifiers = getAdditionalQualifiers(qualifiers);
-
- return new InstanceImpl<U>(sub, injectionPoint, webBeansContext,
parentCreationalContext, qualifiers);
+ Set<Annotation> mergedQualifiers = new HashSet<>(qualifierAnnotations);
+ for (Annotation qualifier : qualifiers)
+ {
+ mergedQualifiers.add(qualifier);
+ }
+ return new InstanceImpl<U>(sub, injectionPoint, webBeansContext,
parentCreationalContext,
+ mergedQualifiers.toArray(new
Annotation[mergedQualifiers.size()]));
}
/**
Modified: openwebbeans/trunk/webbeans-tck/standalone-suite.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/standalone-suite.xml?rev=1796675&r1=1796674&r2=1796675&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/standalone-suite.xml (original)
+++ openwebbeans/trunk/webbeans-tck/standalone-suite.xml Mon May 29 19:07:41
2017
@@ -101,9 +101,14 @@
<methods><exclude
name="testBeanNameWithSeparatedListOfELIdentifiers"/></methods>
</class>
- <!-- OWB provides a bit more for @New than CDI requires -->
+ <!-- OWB provides a bit more for @New than CDI requires
+ https://issues.jboss.org/browse/CDITCK-581
+ -->
<class
name="org.jboss.cdi.tck.tests.lookup.dynamic.DynamicLookupTest">
- <methods><exclude
name="testNewBeanNotEnabledWithouInjectionPoint"/></methods>
+ <methods>
+ <exclude name="testNewBeanNotEnabledWithouInjectionPoint"/>
+ <exclude name="testDuplicateBindingsThrowsException"/>
+ </methods>
</class>
