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/04/28 05:38:04 UTC
svn commit: r1792985 -
/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/inject/FieldHandler.java
Author: cziegeler
Date: Fri Apr 28 05:38:04 2017
New Revision: 1792985
URL: http://svn.apache.org/viewvc?rev=1792985&view=rev
Log:
FELIX-5627 : Class loading issues while finding fields causes an NPE
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/inject/FieldHandler.java
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/inject/FieldHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/inject/FieldHandler.java?rev=1792985&r1=1792984&r2=1792985&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/inject/FieldHandler.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/inject/FieldHandler.java Fri Apr 28 05:38:04 2017
@@ -828,7 +828,9 @@ public class FieldHandler
try
{
field = handler.findField( logger );
- field = handler.validateField( field, logger );
+ if ( field != null ) {
+ field = handler.validateField( field, logger );
+ }
}
catch ( final InvocationTargetException ex )
{