svn commit: r1132617 - in /felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin: JavaClassDescriptorManager.java tags/annotation/AnnotationTagProviderManager.java

[cziegeler]

Author: cziegeler
Date: Mon Jun  6 12:48:17 2011
New Revision: 1132617

URL: http://svn.apache.org/viewvc?rev=1132617&view=rev
Log:
FELIX-2980 : org.apache.felix:maven-scr-plugin:1.7.1-SNAPSHOT:scr failed. 
NullPointerException

Modified:
    
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
    
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java

Modified: 
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java?rev=1132617&r1=1132616&r2=1132617&view=diff
==============================================================================
--- 
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
 (original)
+++ 
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
 Mon Jun  6 12:48:17 2011
@@ -394,7 +394,8 @@ public abstract class JavaClassDescripto
                         // QDox if none found
                         Class<?> clazz = this.classloader.loadClass( className 
);
                         if ( this.processAnnotations
-                            && 
getAnnotationTagProviderManager().hasScrPluginAnnotation( javaClass ) )
+                            && 
getAnnotationTagProviderManager().hasScrPluginAnnotation( javaClass,
+                                    new AnnotationJavaClassDescription( clazz, 
javaClasses[index], this )) )
                         {
                             this.log.debug( "Found java annotation description 
for: " + className );
                             result = new AnnotationJavaClassDescription( 
clazz, javaClasses[index], this );

Modified: 
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java?rev=1132617&r1=1132616&r2=1132617&view=diff
==============================================================================
--- 
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
 (original)
+++ 
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
 Mon Jun  6 12:48:17 2011
@@ -169,11 +169,11 @@ public class AnnotationTagProviderManage
      * @param pClass Class
      * @return true if SCR plugin java annotation found
      */
-    public boolean hasScrPluginAnnotation( JavaClass pClass )
+    public boolean hasScrPluginAnnotation( final JavaClass pClass, final 
AnnotationJavaClassDescription description )
     {
         for ( com.thoughtworks.qdox.model.Annotation annotation : 
pClass.getAnnotations() )
         {
-            if ( getTags( annotation, null ).size() > 0 )
+            if ( getTags( annotation, description ).size() > 0 )
             {
                 return true;
             }