felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1775129 - /felix/trunk/tools/org.apache.felix.scr.generator/src/main/java/org/apache/felix/scrplugin/helper/ClassScanner.java
Date Mon, 19 Dec 2016 16:02:10 GMT
Author: cziegeler
Date: Mon Dec 19 16:02:10 2016
New Revision: 1775129

URL: http://svn.apache.org/viewvc?rev=1775129&view=rev
Log:
SLING-5452 : SCR bnd plugin fails when embedding jars with optional/excluded dependencies.
Apply patch from Stefan Seifert

Modified:
    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/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=1775129&r1=1775128&r2=1775129&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
Mon Dec 19 16:02:10 2016
@@ -148,7 +148,11 @@ public class ClassScanner {
                 throw e;
             } catch ( final SCRDescriptorException e ) {
                 throw e;
-            } catch (final Throwable t) { // e.g. NoClassDefFoundError or ClassNotFoundException,
see FELIX-5328
+            } catch ( final ClassNotFoundException e ) {
+                log.warn("ClassNotFoundException: " + e.getMessage());
+            } catch ( final NoClassDefFoundError e ) {
+                log.warn("NoClassDefFoundError: " + e.getMessage());
+            } catch (final Throwable t) {
                 throw new SCRDescriptorException("Unable to load compiled class: " + src.getClassName(),
src.getFile().toString(), t);
             }
         }



Mime
View raw message