commit 28b8f0e986899db8ea665f9c3d9b7f199c652e97
author Jean-Baptiste Onofré <jbonofre@apache.org> Wed Sep 16 18:01:49 2020 +0200
committer GitHub <noreply@github.com> Wed Sep 16 18:01:49 2020 +0200
tree bc7f03c97eddb35d2bc8d1aa2da77655b59b3826
parent 494ec5316e3503d9c9d5cd9791366a6e2b8e56ac
parent febfde78e6a04b79163d0e9e39351ad8860e1400

Merge pull request #37 from rovarga/felix6315

FELIX-6315: do not deactivate factory component configurations

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 d435dce..7a4ea36 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
@@ -1034,7 +1034,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 );