You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2011/09/28 15:38:10 UTC
svn commit: r1176879 - in /felix/trunk/scrplugin: generator/changelog.txt
generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
maven-scr-plugin/changelog.txt scrtask/changelog.txt
Author: cziegeler
Date: Wed Sep 28 13:38:09 2011
New Revision: 1176879
URL: http://svn.apache.org/viewvc?rev=1176879&view=rev
Log:
FELIX-3136 : Endless loop: JavaClassDescriptorManager.getJavaClassDescription()
Modified:
felix/trunk/scrplugin/generator/changelog.txt
felix/trunk/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
felix/trunk/scrplugin/scrtask/changelog.txt
Modified: felix/trunk/scrplugin/generator/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/generator/changelog.txt?rev=1176879&r1=1176878&r2=1176879&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/changelog.txt (original)
+++ felix/trunk/scrplugin/generator/changelog.txt Wed Sep 28 13:38:09 2011
@@ -4,6 +4,7 @@ Changes from 1.1.2 to 1.1.4
** Bug
* [FELIX-2963] - scr annotations @Activate @Deactivate @Modified are not detected with class inheritance
* [FELIX-3117] - NullPointerException when not implementing interface that is defined with @Service
+ * [FELIX-3136] - Endless loop: JavaClassDescriptorManager.getJavaClassDescription()
Changes from 1.1.0 to 1.1.2
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=1176879&r1=1176878&r2=1176879&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 Wed Sep 28 13:38:09 2011
@@ -408,14 +408,18 @@ public abstract class JavaClassDescripto
if ( this.processAnnotations && !doingHasScrPluginAnnotationCheck
&& hasScrPluginAnnotation(clazz, javaClass) )
{
- this.log.debug( "Found java annotation description for: " + className );
+ this.log.debug( "Generating java annotation description for: " + className );
result = new AnnotationJavaClassDescription( clazz, javaClass, this );
}
else if ( this.parseJavadocs )
{
- this.log.debug( "Found qdox description for: " + className );
+ this.log.debug( "Generating qdox description for: " + className );
result = new QDoxJavaClassDescription( clazz, javaClass, this );
}
+ else
+ {
+ index++;
+ }
}
catch ( ClassNotFoundException e )
{
Modified: felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/changelog.txt?rev=1176879&r1=1176878&r2=1176879&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/changelog.txt (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/changelog.txt Wed Sep 28 13:38:09 2011
@@ -5,6 +5,7 @@ Changes from 1.7.2 to 1.7.4
* [FELIX-2963] - scr annotations @Activate @Deactivate @Modified are not detected with class inheritance
* [FELIX-3117] - NullPointerException when not implementing interface that is defined with @Service
* [FELIX-3070} - SCR Plugin and dependencies with classifier cause issue depending on the order of dependency in pom.xml
+ * [FELIX-3136] - Endless loop: JavaClassDescriptorManager.getJavaClassDescription()
** Improvement
Modified: felix/trunk/scrplugin/scrtask/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/changelog.txt?rev=1176879&r1=1176878&r2=1176879&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/changelog.txt (original)
+++ felix/trunk/scrplugin/scrtask/changelog.txt Wed Sep 28 13:38:09 2011
@@ -4,6 +4,7 @@ Changes from 1.1.2 to 1.1.4
** Bug
* [FELIX-2963] - scr annotations @Activate @Deactivate @Modified are not detected with class inheritance
* [FELIX-3117] - NullPointerException when not implementing interface that is defined with @Service
+ * [FELIX-3136] - Endless loop: JavaClassDescriptorManager.getJavaClassDescription()
Changes from 1.1.0 to 1.1.2