commit 02f457d1a3aeb03112ef9f70c8a534d68da1a4ef
author Felix Meschberger <fmeschbe@apache.org> Thu Aug 20 06:27:17 2009 +0000
committer Felix Meschberger <fmeschbe@apache.org> Thu Aug 20 06:27:17 2009 +0000
tree 2352fa68095ad6abe5dcb18fcee4b83655d850db
parent ce67d7358d69a3a7791150e159599a101ef21595

FELIX-1508 Prevent CM_UPDATED event from being fired after
handling the Configuration.update() call.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@806062 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
index b64a910..d7067b5 100644
--- a/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
+++ b/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
@@ -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 );
         }
     }