felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1454656 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
Date Sat, 09 Mar 2013 04:55:33 GMT
Author: djencks
Date: Sat Mar  9 04:55:32 2013
New Revision: 1454656

URL: http://svn.apache.org/r1454656
Log:
FELIX-3952 fix recursive deadlock

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

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java?rev=1454656&r1=1454655&r2=1454656&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
Sat Mar  9 04:55:32 2013
@@ -721,9 +721,9 @@ public class DependencyManager<S, T> imp
                         this.refPair = null;
                         this.trackingCount = trackingCount;
                         m_componentManager.invokeUnbindMethod( DependencyManager.this, oldRefPair,
trackingCount );
-                        ungetService( oldRefPair );
                         this.refPair = nextRefPair;
                         tracked( trackingCount );
+                        ungetService( oldRefPair );
                     }
                     else //required and no replacement service, deactivate
                     {



Mime
View raw message