FELIX-880 get the ServiceReference from the ServiceRegistration to
provide it in the ConfigurationEvent. The internal field
configurationAdminReference is not set and is not required either
and is therefore removed.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@734535 13f79535-47bb-0310-9956-ffa450edef68
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 239a553..acedda7 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
@@ -91,9 +91,6 @@
// the service registration of the configuration admin
private ServiceRegistration configurationAdminRegistration;
- // the service reference to the ConfigurationAdmin service
- private ServiceReference configurationAdminReference;
-
// the ServiceTracker to emit log services (see log(int, String, Throwable))
private ServiceTracker logTracker;
@@ -777,7 +774,7 @@
Object log = logTracker.getService();
if ( log != null )
{
- ( ( LogService ) log ).log( configurationAdminReference, level, message, t );
+ ( ( LogService ) log ).log( configurationAdminRegistration.getReference(), level, message, t );
return;
}
@@ -1359,7 +1356,8 @@
return;
}
- ConfigurationEvent event = new ConfigurationEvent( configurationAdminReference, type, factoryPid, pid);
+ ConfigurationEvent event = new ConfigurationEvent( configurationAdminRegistration.getReference(), type,
+ factoryPid, pid );
for ( int i = 0; i < srs.length; i++ )
{