commit cac806fc43122a1528a5963d1bb05a1760ced37b
author Marcel Offermans <marrs@apache.org> Tue Dec 22 22:16:43 2009 +0000
committer Marcel Offermans <marrs@apache.org> Tue Dec 22 22:16:43 2009 +0000
tree 5bb8e0369e2dd8ae71aa8e816d7d69e7d21155cb
parent fad200016456dcfa9cb7a722bcd6f3ced277433e

small bugfixes

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

dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java

diff --git a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java
index f90df0c..1446957 100644
--- a/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java
+++ b/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java
@@ -140,8 +140,9 @@
 	}
 
 	public void updated(Dictionary settings) throws ConfigurationException {
-	    m_updateInvokedCache.clear();
-	    
+	    synchronized (m_updateInvokedCache) {
+	        m_updateInvokedCache.clear();
+	    }
 	    Dictionary oldSettings = null; 
 	    synchronized (this) {
 	        oldSettings = m_settings;
@@ -190,7 +191,11 @@
 	}
 
     public void invokeUpdate(DependencyService ds, Object service, Dictionary settings) throws ConfigurationException {
-        if (m_updateInvokedCache.add(ds)) {
+        boolean wasAdded;
+        synchronized (m_updateInvokedCache) {
+            wasAdded = m_updateInvokedCache.add(ds);
+        }
+        if (wasAdded) {
             String callback = (m_callback == null) ? "updated" : m_callback;
             Method m;
             try {