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 2014/11/13 20:20:56 UTC
svn commit: r1639473 -
/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/FieldHandler.java
Author: cziegeler
Date: Thu Nov 13 19:20:55 2014
New Revision: 1639473
URL: http://svn.apache.org/r1639473
Log:
FELIX-4631 : [DS][R6/RFC212] Implement field injection.
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/FieldHandler.java
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/FieldHandler.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/FieldHandler.java?rev=1639473&r1=1639472&r2=1639473&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/FieldHandler.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/FieldHandler.java Thu Nov 13 19:20:55 2014
@@ -794,6 +794,7 @@ public class FieldHandler
{
logger.log( LogService.LOG_WARNING, "{0} cannot be found", new Object[]
{handler.metadata.getField()}, ex.getTargetException() );
+ field = null;
}
handler.setField( field, logger );
@@ -941,21 +942,17 @@ public class FieldHandler
public InitReferenceMethod getInit()
{
- if ( metadata.isMultiple() )
+ return new InitReferenceMethod()
{
- return new InitReferenceMethod()
- {
- public boolean init(final Object componentInstance, final SimpleLogger logger)
+ public boolean init(final Object componentInstance, final SimpleLogger logger)
+ {
+ if ( fieldExists( logger) )
{
- if ( fieldExists( logger) )
- {
- return initField(componentInstance, logger);
- }
- return false;
+ return initField(componentInstance, logger);
}
- };
- }
- return null;
+ return false;
+ }
+ };
}
}