Author: fmeschbe
Date: Mon Jul 2 15:18:08 2012
New Revision: 1356293
URL: http://svn.apache.org/viewvc?rev=1356293&view=rev
Log:
FELIX-3577 Fix a conversion glitch (calling service reference removal instead
of configuration removal). Also renamed the provide and remove methods to
provideConfiguration and removeConfiguration to make the distinction of removal
clear.
Modified:
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/BaseTracker.java
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/ManagedServiceFactoryTracker.java
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/ManagedServiceTracker.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?rev=1356293&r1=1356292&r2=1356293&view=diff
==============================================================================
---
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 Jul 2 15:18:08 2012
@@ -1556,7 +1556,7 @@ public class ConfigurationManager implem
}
else if ( canReceive( refBundle, configBundleLocation ) )
{
- helper.provide( ref, this.config, this.properties );
+ helper.provideConfiguration( ref, this.config,
this.properties );
}
else
{
@@ -1628,7 +1628,7 @@ public class ConfigurationManager implem
}
else if ( canReceive( srBundle, configLocation ) )
{
- this.helper.remove( sr, this.config );
+ this.helper.removeConfiguration( sr, this.config );
}
else
{
@@ -1705,7 +1705,7 @@ public class ConfigurationManager implem
if ( wasVisible && !isVisible )
{
// call deleted method
- helper.remove( sr );
+ helper.removeConfiguration( sr, this.config );
log( LogService.LOG_DEBUG, "Configuration {0} revoked
from {1} (no more visibility)",
new Object[]
{ config.getPid(),
ConfigurationManager.toString( sr ) } );
@@ -1713,7 +1713,7 @@ public class ConfigurationManager implem
else if ( !wasVisible && isVisible )
{
// call updated method
- helper.provide( sr, this.config, this.properties );
+ helper.provideConfiguration( sr, this.config,
this.properties );
log( LogService.LOG_DEBUG, "Configuration {0} provided
to {1} (new visibility)", new Object[]
{ config.getPid(), ConfigurationManager.toString(
sr ) } );
}
Modified:
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/BaseTracker.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/BaseTracker.java?rev=1356293&r1=1356292&r2=1356293&view=diff
==============================================================================
---
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/BaseTracker.java
(original)
+++
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/BaseTracker.java
Mon Jul 2 15:18:08 2012
@@ -143,10 +143,10 @@ public abstract class BaseTracker<S> ext
protected abstract boolean isFactory();
// Updates
- public abstract void provide( ServiceReference<S> service,
ConfigurationImpl config, Dictionary<String, ?> properties );
+ public abstract void provideConfiguration( ServiceReference<S> service,
ConfigurationImpl config, Dictionary<String, ?> properties );
- public abstract void remove( ServiceReference<S> service,
ConfigurationImpl config );
+ public abstract void removeConfiguration( ServiceReference<S> service,
ConfigurationImpl config );
protected final S getRealService( ServiceReference<S> reference )
Modified:
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/ManagedServiceFactoryTracker.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/ManagedServiceFactoryTracker.java?rev=1356293&r1=1356292&r2=1356293&view=diff
==============================================================================
---
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/ManagedServiceFactoryTracker.java
(original)
+++
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/ManagedServiceFactoryTracker.java
Mon Jul 2 15:18:08 2012
@@ -42,7 +42,7 @@ public class ManagedServiceFactoryTracke
@Override
- public void provide( ServiceReference<ManagedServiceFactory> reference,
final ConfigurationImpl config, final Dictionary<String, ?> rawProps )
+ public void provideConfiguration( ServiceReference<ManagedServiceFactory>
reference, final ConfigurationImpl config, final Dictionary<String, ?> rawProps
)
{
ManagedServiceFactory service = getRealService( reference );
if ( service != null )
@@ -65,7 +65,7 @@ public class ManagedServiceFactoryTracke
@Override
- public void remove( ServiceReference<ManagedServiceFactory> reference,
final ConfigurationImpl config )
+ public void removeConfiguration( ServiceReference<ManagedServiceFactory>
reference, final ConfigurationImpl config )
{
ManagedServiceFactory service = this.getRealService( reference );
if ( service != null )
Modified:
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/ManagedServiceTracker.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/ManagedServiceTracker.java?rev=1356293&r1=1356292&r2=1356293&view=diff
==============================================================================
---
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/ManagedServiceTracker.java
(original)
+++
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/helper/ManagedServiceTracker.java
Mon Jul 2 15:18:08 2012
@@ -43,7 +43,7 @@ public class ManagedServiceTracker exten
@Override
- public void provide( ServiceReference<ManagedService> service, final
ConfigurationImpl config, Dictionary<String, ?> properties )
+ public void provideConfiguration( ServiceReference<ManagedService>
service, final ConfigurationImpl config, Dictionary<String, ?> properties )
{
ManagedService srv = this.getRealService( service );
if ( srv != null )
@@ -65,7 +65,7 @@ public class ManagedServiceTracker exten
}
@Override
- public void remove( ServiceReference<ManagedService> service, final
ConfigurationImpl config )
+ public void removeConfiguration( ServiceReference<ManagedService> service,
final ConfigurationImpl config )
{
ManagedService srv = this.getRealService( service );
try
