commit c760969199e05da4e4f51c12c964b66fd9300982
author David Jencks <djencks@apache.org> Tue May 07 21:50:18 2013 +0000
committer David Jencks <djencks@apache.org> Tue May 07 21:50:18 2013 +0000
tree 879bd0b16cee312620cb069ed8c818c2ffe6c736
parent 18c86c83de2e8fc5a1156257f47792b207a830a6

FELIX-3584 fix factory pids in location tracking

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1480105 13f79535-47bb-0310-9956-ffa450edef68

scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
index 1ec228c..7f61098 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
@@ -267,7 +267,7 @@
                     if ( checkBundleLocation( config, bundleContext.getBundle() ) )
                     {
                         long changeCount = changeCounter.getChangeCount( config, true, componentHolder.getChangeCount( pid.getServicePid() ) );
-                        componentHolder.configurationUpdated( pid.getServicePid(), config.getProperties(), changeCount, pid );
+                        componentHolder.configurationUpdated( pid.getServicePid(), config.getProperties(), changeCount, factoryPid == null? pid: factoryPid );
                     }
                     
                     break;