commit febfde78e6a04b79163d0e9e39351ad8860e1400
author Robert Varga <robert.varga@pantheon.tech> Fri Jul 31 22:24:01 2020 +0200
committer Robert Varga <robert.varga@pantheon.tech> Fri Jul 31 22:24:01 2020 +0200
tree a8fedc7ef4ae8e8ced72596810ff62904212e4d1
parent 56b688400d99a868a1cf306074ee5257db3a78e2

FELIX-6315: do not deactivate factory component configurations

Reaching zero reference count for a component configuration created
via a component factory should not trigger that configuration being
deactivated.

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

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
index cbc68c0..c86a6c4 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/SingleComponentManager.java
@@ -1040,7 +1040,8 @@
             // unget the service instance if no bundle is using it
             // any longer unless delayed component instances have to
             // be kept (FELIX-3039)
-            if (  m_useCount.decrementAndGet() == 0 && !isImmediate() && !keepInstances() )
+            if ( m_useCount.decrementAndGet() == 0 && !isImmediate()
+                    && !getComponentMetadata().isFactory() && !keepInstances() )
             {
                 final State previousState = getState();
                 deleteComponent( ComponentConstants.DEACTIVATION_REASON_UNSPECIFIED );