svn commit: r1842515 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java

[ro...@apache.org]

Author: rotty3000
Date: Mon Oct  1 16:21:39 2018
New Revision: 1842515

URL: http://svn.apache.org/viewvc?rev=1842515&view=rev
Log:
FELIX-5947 ClassLoader memory leak

Signed-off-by: Raymond Auge <ro...@apache.org>

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=1842515&r1=1842514&r2=1842515&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 Mon Oct  1 16:21:39 2018
@@ -1657,7 +1657,9 @@ public class DependencyManager<S, T> imp
     {
         // only invoke the unbind method if there is an instance (might be null
         // in the delayed component situation) and the unbind method is declared.
-        boolean doUnbind = componentContext != null && m_dependencyMetadata.getUnbind() != null;
+        boolean doUnbind =
+            componentContext != null &&
+                (m_dependencyMetadata.getField() != null || m_dependencyMetadata.getUnbind() != null);
 
         AtomicInteger trackingCount = new AtomicInteger();
         Collection<RefPair<S, T>> refPairs;