svn commit: r1851456 - /felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java

[rotty3000]

Author: rotty3000
Date: Wed Jan 16 15:51:06 2019
New Revision: 1851456

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

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

Modified:
    
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java

Modified: 
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
URL: 
http://svn.apache.org/viewvc/felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java?rev=1851456&r1=1851455&r2=1851456&view=diff
==============================================================================
--- 
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
 (original)
+++ 
felix/branches/scr-2.0.x/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
 Wed Jan 16 15:51:06 2019
@@ -1577,7 +1577,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;