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

[fmeschbe]

Author: fmeschbe
Date: Thu Aug 20 06:27:17 2009
New Revision: 806062

URL: http://svn.apache.org/viewvc?rev=806062&view=rev
Log:
FELIX-1508 Prevent CM_UPDATED event from being fired after
handling the Configuration.update() call.

Modified:
    
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java

Modified: 
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java?rev=806062&r1=806061&r2=806062&view=diff
==============================================================================
--- 
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
 (original)
+++ 
felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
 Thu Aug 20 06:27:17 2009
@@ -189,7 +189,8 @@
 
             configureFromPersistence( properties );
 
-            getConfigurationManager().updated( this );
+            // update the service but do not fire an CM_UPDATED event
+            getConfigurationManager().updated( this, false );
         }
     }
 
@@ -240,7 +241,8 @@
             // finally assign the configuration for use
             configure( newProperties );
 
-            getConfigurationManager().updated( this );
+            // update the service and fire an CM_UPDATED event
+            getConfigurationManager().updated( this, true );
         }
     }