svn commit: r1467882 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation: ProducerFieldBeansBuilder.java ProducerMethodBeansBuilder.java

[rmannibucau]

Author: rmannibucau
Date: Mon Apr 15 07:39:26 2013
New Revision: 1467882

URL: http://svn.apache.org/r1467882
Log:
OWB-831 filtering producers by annotated type is too strict (java type should 
be enough) since it prevents extensions to add producers

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java?rev=1467882&r1=1467881&r2=1467882&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
 Mon Apr 15 07:39:26 2013
@@ -77,7 +77,7 @@ public class ProducerFieldBeansBuilder<T
         Set<AnnotatedField<? super T>> annotatedFields = 
annotatedType.getFields();        
         for(AnnotatedField<? super T> annotatedField: annotatedFields)
         {
-            if(annotatedField.isAnnotationPresent(Produces.class) && 
annotatedField.getDeclaringType().equals(annotatedType))
+            if(annotatedField.isAnnotationPresent(Produces.class) && 
annotatedField.getDeclaringType().getJavaClass().equals(annotatedType.getJavaClass()))
             {
                 Type genericType = annotatedField.getBaseType();
                 

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java?rev=1467882&r1=1467881&r2=1467882&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java
 Mon Apr 15 07:39:26 2013
@@ -73,7 +73,7 @@ public class ProducerMethodBeansBuilder<
         
         for(AnnotatedMethod<? super T> annotatedMethod: annotatedMethods)
         {
-            if(annotatedMethod.isAnnotationPresent(Produces.class) && 
annotatedMethod.getDeclaringType().equals(annotatedType))
+            if(annotatedMethod.isAnnotationPresent(Produces.class) && 
annotatedMethod.getDeclaringType().getJavaClass().equals(annotatedType.getJavaClass()))
             {
                 checkProducerMethodForDeployment(annotatedMethod);
                 boolean specialize = false;