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 16:24:30 UTC
svn commit: r1176892 - 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 14:24:29 2011
New Revision: 1176892
URL: http://svn.apache.org/viewvc?rev=1176892&view=rev
Log:
FELIX-3113 - NPE in multi-module Maven project
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=1176892&r1=1176891&r2=1176892&view=diff
==============================================================================
--- felix/trunk/scrplugin/generator/changelog.txt (original)
+++ felix/trunk/scrplugin/generator/changelog.txt Wed Sep 28 14:24:29 2011
@@ -5,7 +5,8 @@ Changes from 1.1.2 to 1.1.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-3136] - Endless loop: JavaClassDescriptorManager.getJavaClassDescription()
-
+ * [FELIX-3113] - NPE in multi-module Maven project
+
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=1176892&r1=1176891&r2=1176892&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 14:24:29 2011
@@ -243,12 +243,12 @@ public abstract class JavaClassDescripto
}
}
- // now create map with component descriptions
- this.componentDescriptions = new HashMap<String, Component>();
- for ( final Component component : components )
- {
- this.componentDescriptions.put( component.getImplementation().getClassame(), component );
- }
+ }
+ // now create map with component descriptions
+ this.componentDescriptions = new HashMap<String, Component>();
+ for ( final Component component : components )
+ {
+ this.componentDescriptions.put( component.getImplementation().getClassame(), component );
}
}
Modified: felix/trunk/scrplugin/maven-scr-plugin/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/changelog.txt?rev=1176892&r1=1176891&r2=1176892&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/changelog.txt (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/changelog.txt Wed Sep 28 14:24:29 2011
@@ -6,6 +6,7 @@ Changes from 1.7.2 to 1.7.4
* [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()
+ * [FELIX-3113] - NPE in multi-module Maven project
** Improvement
Modified: felix/trunk/scrplugin/scrtask/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/scrtask/changelog.txt?rev=1176892&r1=1176891&r2=1176892&view=diff
==============================================================================
--- felix/trunk/scrplugin/scrtask/changelog.txt (original)
+++ felix/trunk/scrplugin/scrtask/changelog.txt Wed Sep 28 14:24:29 2011
@@ -5,6 +5,7 @@ Changes from 1.1.2 to 1.1.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-3136] - Endless loop: JavaClassDescriptorManager.getJavaClassDescription()
+ * [FELIX-3113] - NPE in multi-module Maven project
Changes from 1.1.0 to 1.1.2