svn commit: r734535 - /felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java

[fm...@apache.org]

Author: fmeschbe
Date: Wed Jan 14 14:28:20 2009
New Revision: 734535

URL: http://svn.apache.org/viewvc?rev=734535&view=rev
Log:
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.

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?rev=734535&r1=734534&r2=734535&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 Wed Jan 14 14:28:20 2009
@@ -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++ )
             {