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 2015/08/04 03:04:34 UTC
svn commit: r1693990 -
/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
Author: cziegeler
Date: Tue Aug 4 01:04:34 2015
New Revision: 1693990
URL: http://svn.apache.org/r1693990
Log:
FELIX-4990 : Only first factoy configuration is used
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java?rev=1693990&r1=1693989&r2=1693990&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java Tue Aug 4 01:04:34 2015
@@ -95,8 +95,10 @@ public class ConfigurationSupport implem
}
}
- // ---------- BaseConfigurationSupport overwrites
-
+ /**
+ * The return value is only relevant for the call from {@link #configurationEvent(ConfigurationEvent)}
+ * in the case of a deleted configuration which is not a factory configuration!
+ */
public boolean configureComponentHolder(final ComponentHolder<?> holder)
{
@@ -127,9 +129,9 @@ public class ConfigurationSupport implem
bundleContext.getBundle() );
if ( !factory.isEmpty() )
{
+ boolean created = false;
for ( Configuration config: factory )
{
- boolean created = false;
Activator.log( LogService.LOG_DEBUG, null,
"Configuring holder {0} with factory configuration {1}", new Object[] {
holder, config }, null );
@@ -142,10 +144,10 @@ public class ConfigurationSupport implem
config.getProperties(),
changeCount );
}
- if ( !created )
- {
- return false;
- }
+ }
+ if ( !created )
+ {
+ return false;
}
}
else