FELIX-3136 : Endless loop: JavaClassDescriptorManager.getJavaClassDescription()
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1176879 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/generator/changelog.txt b/scrplugin/generator/changelog.txt
index e108a81..7499109 100644
--- a/scrplugin/generator/changelog.txt
+++ b/scrplugin/generator/changelog.txt
@@ -4,6 +4,7 @@
** 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
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
index 7583624..ecc90fd 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
@@ -408,14 +408,18 @@
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 )
{
diff --git a/scrplugin/maven-scr-plugin/changelog.txt b/scrplugin/maven-scr-plugin/changelog.txt
index 4552029..ad52373 100644
--- a/scrplugin/maven-scr-plugin/changelog.txt
+++ b/scrplugin/maven-scr-plugin/changelog.txt
@@ -5,6 +5,7 @@
* [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
diff --git a/scrplugin/scrtask/changelog.txt b/scrplugin/scrtask/changelog.txt
index 1ac2f31..ed863e5 100644
--- a/scrplugin/scrtask/changelog.txt
+++ b/scrplugin/scrtask/changelog.txt
@@ -4,6 +4,7 @@
** 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