Author: fmeschbe
Date: Mon Aug 6 01:56:50 2007
New Revision: 563070
URL: http://svn.apache.org/viewvc?view=rev&rev=563070
Log:
FELIX-334 Missing callbacks for Configuration plugins
Modified:
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
Modified:
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java?view=diff&rev=563070&r1=563069&r2=563070
==============================================================================
---
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
(original)
+++
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
Mon Aug 6 01:56:50 2007
@@ -925,7 +925,7 @@
ConfigurationImpl cfg;
try
{
- cfg = getConfiguration( pid, bundleLocation );
+ cfg = getConfiguration( pid, false );
}
catch ( IOException ioe )
{
@@ -945,7 +945,7 @@
else if ( !factoryPid.equals( cfg.getFactoryPid() ) )
{
log( LogService.LOG_ERROR, "Configuration " + pid + "
referred to by factory " + factoryPid
- + " does not exist seems to belong to factory " +
cfg.getFactoryPid(), null );
+ + " seems to belong to factory " +
cfg.getFactoryPid(), null );
factory.removePID( pid );
factory.storeSilently();
continue;
@@ -1040,7 +1040,11 @@
return;
}
- srv.updated( config.getProperties() );
+ // prepare the configuration for the service (call
plugins)
+ Dictionary dictionary = callPlugins( sr[0], config
);
+
+ // update the ManagedService with the properties
+ srv.updated( dictionary );
}
finally
{
@@ -1076,7 +1080,12 @@
return;
}
- srv.updated( config.getPid(),
config.getProperties() );
+
+ // prepare the configuration for the service (call
plugins)
+ Dictionary dictionary = callPlugins( sr[0], config
);
+
+ // update the ManagedServiceFactory with the
properties
+ srv.updated( config.getPid(), dictionary );
}
finally
{
