[FELIX-4349] Synchronization issue in ComponentRegistry

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: scr-1.8.0
• Fix Version/s: scr-1.8.2
• Component/s: Declarative Services (SCR)
• Assignee: Guillaume Nodet
• Reporter: Guillaume Nodet
• Created: 08/Dec/13 19:42
• Updated: 06/Aug/14 02:21
• Resolved: 08/Dec/13 20:25

Description

Investigating an issue in some of our integration test, we found that the ComponentRegistry#m_missingDependencies field is wrongly synchronized.

Two methods are accessing this Map, registerMissingDependency and missingServicePresent, but only the first one is synchronized.

Patch proposed:

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java b/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
index 9b307a9..c40ab5f 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java
@@ -660,7 +660,7 @@ public class ComponentRegistry implements ScrService, ServiceListener
         }
     }
 
-    public void missingServicePresent( final ServiceReference serviceReference, ComponentActorThread actor )
+    public synchronized void missingServicePresent( final ServiceReference serviceReference, ComponentActorThread actor )
     {
         final List<Entry> dependencyManagers = m_missingDependencies.remove( serviceReference );
         if ( dependencyManagers != null )