commit bb2c640117191dc126f6e320a2a4c75930cf0ba1
author David Jencks <djencks@apache.org> Fri Sep 28 00:02:20 2012 +0000
committer David Jencks <djencks@apache.org> Fri Sep 28 00:02:20 2012 +0000
tree 46010d14951e01e5ab13ee04e62e6df5932344ac
parent 7eb90aacdb7fda34540995ed40919f9c4965279a

FELIX-3680 fix another concurrency problem demonstrated by Pierres test

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

scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
index 6e20719..a904ce3 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
@@ -1159,6 +1159,11 @@
                 Map deps = ( Map ) dependencyMap.get( this );
                 BundleContext bundleContext = m_componentManager.getActivator().getBundleContext();
                 AbstractComponentManager.RefPair refPair = m_bindMethods.getBind().getServiceObject( ref, bundleContext );
+                if ( refPair == null )
+                {
+                    //reference deactivated while we are processing.
+                    return false;
+                }
                 deps.put( ref, refPair );
                 return invokeBindMethod( componentInstance, refPair );
             }