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

[fmeschbe]

Author: fmeschbe
Date: Tue Jan 31 07:17:46 2012
New Revision: 1238190

URL: http://svn.apache.org/viewvc?rev=1238190&view=rev
Log:
Improve loggin of configuration update failure and include pid of the 
configuration whose updated failed.

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=1238190&r1=1238189&r2=1238190&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
 Tue Jan 31 07:17:46 2012
@@ -1105,20 +1105,20 @@ public class ConfigurationManager implem
             final ConfigurationException ce = ( ConfigurationException ) error;
             if ( ce.getProperty() != null )
             {
-                log( LogService.LOG_ERROR, "{0}: Updating configuration 
property {1} caused a problem: {2}",
+                log( LogService.LOG_ERROR, "{0}: Updating property {1} of 
configuration {2} caused a problem: {3}",
                     new Object[]
-                        { toString( target ), ce.getProperty(), 
ce.getReason(), ce } );
+                        { toString( target ), ce.getProperty(), 
config.getPid(), ce.getReason(), ce } );
             }
             else
             {
-                log( LogService.LOG_ERROR, "{0}: Updating configuration caused 
a problem: {1}", new Object[]
-                    { toString( target ), ce.getReason(), ce } );
+                log( LogService.LOG_ERROR, "{0}: Updating configuration {1} 
caused a problem: {2}", new Object[]
+                    { toString( target ), config.getPid(), ce.getReason(), ce 
} );
             }
         }
         else
         {
             {
-                log( LogService.LOG_ERROR, "{0}: Unexpected problem updating 
{1}", new Object[]
+                log( LogService.LOG_ERROR, "{0}: Unexpected problem updating 
configuration {1}", new Object[]
                     { toString( target ), config, error } );
             }