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 2017/11/08 15:28:44 UTC
svn commit: r1814590 - in /felix/trunk/tools/org.apache.felix.scr.generator:
changelog.txt
src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
Author: cziegeler
Date: Wed Nov 8 15:28:44 2017
New Revision: 1814590
URL: http://svn.apache.org/viewvc?rev=1814590&view=rev
Log:
FELIX-5464 : java.lang.NullPointerException at org.apache.felix.scrplugin.helper.ClassScanner.processClass(ClassScanner.java:207)
Modified:
felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt
felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
Modified: felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt?rev=1814590&r1=1814589&r2=1814590&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt (original)
+++ felix/trunk/tools/org.apache.felix.scr.generator/changelog.txt Wed Nov 8 15:28:44 2017
@@ -1,3 +1,11 @@
+Changes from 1.17.0 to 1.18.0
+-----------------------------
+** Bug
+ * [FELIX-5464] - java.lang.NullPointerException at org.apache.felix.scrplugin.helper.ClassScanner.processClass(ClassScanner.java:207)
+ * [FELIX-5729] - NoSuchFieldError when @Reference referenceInterface type different than field type
+ * [FELIX-5730] - Different separators in localization attribute
+
+
Changes from 1.16.0 to 1.17.0
-----------------------------
** Bug
Modified: felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
URL: http://svn.apache.org/viewvc/felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java?rev=1814590&r1=1814589&r2=1814590&view=diff
==============================================================================
--- felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java (original)
+++ felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java Wed Nov 8 15:28:44 2017
@@ -208,7 +208,9 @@ public class ClassScanner {
try {
classReader = new ClassReader(input);
} finally {
- input.close();
+ if ( input != null ) {
+ input.close();
+ }
}
final ClassNode classNode = new ClassNode();
classReader.accept(classNode, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES);