FELIX-1488 support for another use case:
1. Create configuration pid1 with null location and set properties
2. Install bundle locationA with ManagedServiceA pid1
3. Install bundle locationB with ManagedServiceB pid1
4. Uninstall bundle locationA
==> configuration to be assigned to locationB/pid1 service
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@805776 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationBase.java b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationBase.java
index d5e72d6..b5192cf 100644
--- a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationBase.java
+++ b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationBase.java
@@ -23,7 +23,6 @@
import java.util.Dictionary;
import org.apache.felix.cm.PersistenceManager;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.log.LogService;
@@ -65,7 +64,7 @@
protected ConfigurationBase( final ConfigurationManager configurationManager,
- final PersistenceManager persistenceManager, final String baseId, final Dictionary props )
+ final PersistenceManager persistenceManager, final String baseId, final String bundleLocation )
{
if ( configurationManager == null )
{
@@ -82,11 +81,7 @@
this.baseId = baseId;
// set bundle location from persistence and/or check for dynamic binding
- if ( props != null )
- {
- this.staticBundleLocation = ( String ) props.get( ConfigurationAdmin.SERVICE_BUNDLELOCATION );
- }
-
+ this.staticBundleLocation = bundleLocation;
this.dynamicBundleLocation = configurationManager.getDynamicBundleLocation( baseId );
}
@@ -154,25 +149,24 @@
void setStaticBundleLocation( final String bundleLocation )
{
- // FELIX-1488: If a configuration is bound to a location and a new
- // location is statically set, the old binding must be removed
- // by removing the configuration from the targets and the new binding
- // must be setup by updating the configuration for new targets
- boolean replace = ( this instanceof ConfigurationImpl ) && ( bundleLocation != null );
- if ( replace && getDynamicBundleLocation() != null && !bundleLocation.equals( getDynamicBundleLocation() ) )
- {
- // remove configuration from current managed service [factory]
- getConfigurationManager().deleted( ( ConfigurationImpl ) this, false );
- }
-
// 104.15.2.8 The bundle location will be set persistently
this.staticBundleLocation = bundleLocation;
storeSilently();
- // check whether we have to assign the configuration to new targets
- if ( replace )
+ // FELIX-1488: If a configuration is bound to a location and a new
+ // location is statically set, the old binding must be removed
+ // by removing the configuration from the targets and the new binding
+ // must be setup by updating the configuration for new targets
+ if ( ( this instanceof ConfigurationImpl ) && ( bundleLocation != null ) )
{
- getConfigurationManager().updated( ( ConfigurationImpl ) this, false );
+ // remove configuration from current managed service [factory]
+ if ( getDynamicBundleLocation() != null && !bundleLocation.equals( getDynamicBundleLocation() ) )
+ {
+ getConfigurationManager().revokeConfiguration( ( ConfigurationImpl ) this );
+ }
+
+ // check whether we have to assign the configuration to new targets
+ getConfigurationManager().reassignConfiguration( ( ConfigurationImpl ) this );
}
}
@@ -181,6 +175,14 @@
{
this.dynamicBundleLocation = bundleLocation;
this.configurationManager.setDynamicBundleLocation( this.getBaseId(), bundleLocation );
+
+ // FELIX-1488: If a dynamically bound configuration is unbound and not
+ // statically bound, it may be rebound to another bundle asking for it
+ // (unless the dynamic unbind happens due to configuration deletion)
+ if ( bundleLocation == null && getStaticBundleLocation() == null && ( this instanceof ConfigurationImpl ) )
+ {
+ getConfigurationManager().reassignConfiguration( ( ConfigurationImpl ) this );
+ }
}
diff --git a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
index e3288ed..b64a910 100644
--- a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
+++ b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
@@ -84,7 +84,8 @@
ConfigurationImpl( ConfigurationManager configurationManager, PersistenceManager persistenceManager,
Dictionary properties )
{
- super( configurationManager, persistenceManager, ( String ) properties.remove( Constants.SERVICE_PID ), properties );
+ super( configurationManager, persistenceManager, ( String ) properties.remove( Constants.SERVICE_PID ),
+ ( String ) properties.remove( ConfigurationAdmin.SERVICE_BUNDLELOCATION ) );
this.factoryPID = ( String ) properties.remove( ConfigurationAdmin.SERVICE_FACTORYPID );
this.isDeleted = false;
@@ -97,15 +98,12 @@
ConfigurationImpl( ConfigurationManager configurationManager, PersistenceManager persistenceManager, String pid,
String factoryPid, String bundleLocation ) throws IOException
{
- super( configurationManager, persistenceManager, pid, null );
+ super( configurationManager, persistenceManager, pid, bundleLocation );
this.factoryPID = factoryPid;
this.isDeleted = false;
this.properties = null;
- // static bundle binding here
- setStaticBundleLocation( bundleLocation );
-
// this is a new configuration object, store immediately unless
// the new configuration object is created from a factory, in which
// case the configuration is only stored when first updated
@@ -123,7 +121,8 @@
{
this.isDeleted = true;
getPersistenceManager().delete( this.getPid() );
- getConfigurationManager().deleted( this, true );
+ getConfigurationManager().setDynamicBundleLocation( this.getPid(), null );
+ getConfigurationManager().deleted( this );
}
@@ -190,7 +189,7 @@
configureFromPersistence( properties );
- getConfigurationManager().updated( this, true );
+ getConfigurationManager().updated( this );
}
}
@@ -241,7 +240,7 @@
// finally assign the configuration for use
configure( newProperties );
- getConfigurationManager().updated( this, true );
+ getConfigurationManager().updated( this );
}
}
diff --git a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
index 06b270f..82590ed 100644
--- a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
+++ b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
@@ -558,17 +558,33 @@
}
- void deleted( ConfigurationImpl config, boolean fireEvent )
+ void deleted( ConfigurationImpl config )
{
// remove the configuration from the cache
removeConfiguration( config );
- updateThread.schedule( new DeleteConfiguration( config, fireEvent ) );
+ updateThread.schedule( new DeleteConfiguration( config, true ) );
}
- void updated( ConfigurationImpl config, boolean fireEvent )
+ void updated( ConfigurationImpl config )
{
- updateThread.schedule( new UpdateConfiguration( config, fireEvent ) );
+ updateThread.schedule( new UpdateConfiguration( config, true ) );
+ }
+
+
+ void revokeConfiguration( ConfigurationImpl config )
+ {
+ updateThread.schedule( new DeleteConfiguration( config, false ) );
+
+ // immediately unbind the configuration
+ config.setDynamicBundleLocation( null );
+ config.setServiceReference( null );
+ }
+
+
+ void reassignConfiguration( ConfigurationImpl config )
+ {
+ updateThread.schedule( new UpdateConfiguration( config, false ) );
}
@@ -1508,10 +1524,6 @@
this.factoryPid = config.getFactoryPid();
this.configLocation = config.getBundleLocation();
this.fireEvent = fireEvent;
-
- // immediately unbind the configuration
- config.setDynamicBundleLocation( null );
- config.setServiceReference( null );
}
diff --git a/configadmin/src/main/java/org/apache/felix/cm/impl/Factory.java b/configadmin/src/main/java/org/apache/felix/cm/impl/Factory.java
index 1c59d9e..48589f1 100644
--- a/configadmin/src/main/java/org/apache/felix/cm/impl/Factory.java
+++ b/configadmin/src/main/java/org/apache/felix/cm/impl/Factory.java
@@ -72,8 +72,8 @@
Factory( ConfigurationManager configurationManager, PersistenceManager persistenceManager, String factoryPid, Dictionary props )
{
- super(configurationManager, persistenceManager, factoryPid, props);
-
+ super( configurationManager, persistenceManager, factoryPid, ( String ) props
+ .get( ConfigurationAdmin.SERVICE_BUNDLELOCATION ) );
// set pids
String[] pidList = ( String[] ) props.get( FACTORY_PID_LIST );