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

[fm...@apache.org]

Author: fmeschbe
Date: Thu Jan 15 00:53:36 2009
New Revision: 734634

URL: http://svn.apache.org/viewvc?rev=734634&view=rev
Log:
FELIX-881 provide getter for the service reference preventing
NullPointerException if the service has already been unregistered

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=734634&r1=734633&r2=734634&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 Thu Jan 15 00:53:36 2009
@@ -550,6 +550,13 @@
     }
 
 
+    private ServiceReference getServiceReference()
+    {
+        ServiceRegistration reg = configurationAdminRegistration;
+        return ( reg != null ) ? reg.getReference() : null;
+    }
+
+
     private void configure( ServiceReference sr, ManagedService service )
     {
         String pid = ( String ) sr.getProperty( Constants.SERVICE_PID );
@@ -774,7 +781,7 @@
         Object log = logTracker.getService();
         if ( log != null )
         {
-            ( ( LogService ) log ).log( configurationAdminRegistration.getReference(), level, message, t );
+            ( ( LogService ) log ).log( getServiceReference(), level, message, t );
             return;
         }
 
@@ -1356,8 +1363,7 @@
                 return;
             }
 
-            ConfigurationEvent event = new ConfigurationEvent( configurationAdminRegistration.getReference(), type,
-                factoryPid, pid );
+            ConfigurationEvent event = new ConfigurationEvent( getServiceReference(), type, factoryPid, pid );
 
             for ( int i = 0; i < srs.length; i++ )
             {