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

[fmeschbe]

Author: fmeschbe
Date: Fri Feb 18 13:11:03 2011
New Revision: 1071990

URL: http://svn.apache.org/viewvc?rev=1071990&view=rev
Log:
FELIX-2847 Prevent NPE if service already 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=1071990&r1=1071989&r2=1071990&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
 Fri Feb 18 13:11:03 2011
@@ -1006,18 +1006,28 @@ public class ConfigurationManager implem
     static String toString( ServiceReference ref )
     {
         String[] ocs = ( String[] ) ref.getProperty( "objectClass" );
-        String oc = "[";
+        StringBuffer buf = new StringBuffer("[");
         for ( int i = 0; i < ocs.length; i++ )
         {
-            oc += ocs[i];
+            buf.append(ocs[i]);
             if ( i < ocs.length - 1 )
-                oc += ", ";
+                buf.append(", ");
         }
 
-        oc += ", id=" + ref.getProperty( Constants.SERVICE_ID );
-        oc += ", bundle=" + ref.getBundle().getBundleId();
-        oc += "]";
-        return oc;
+        buf.append( ", id=" ).append( ref.getProperty( Constants.SERVICE_ID ) 
);
+
+        Bundle provider = ref.getBundle();
+        if ( provider != null )
+        {
+            buf.append( ", bundle=" ).append( provider.getBundleId() );
+        }
+        else
+        {
+            buf.append( ", unregistered" );
+        }
+
+        buf.append( "]" );
+        return buf.toString();
     }