Author: gnodet
Date: Thu Mar 2 09:12:45 2017
New Revision: 1785091
URL: http://svn.apache.org/viewvc?rev=1785091&view=rev
Log:
[FELIX-5576] - SCR components and factoryPids random issues
Patch provided by Paolo Antinori
Modified:
felix/branches/scr-1.8.x/changelog.txt
felix/branches/scr-1.8.x/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
Modified: felix/branches/scr-1.8.x/changelog.txt
URL:
http://svn.apache.org/viewvc/felix/branches/scr-1.8.x/changelog.txt?rev=1785091&r1=1785090&r2=1785091&view=diff
==============================================================================
--- felix/branches/scr-1.8.x/changelog.txt (original)
+++ felix/branches/scr-1.8.x/changelog.txt Thu Mar 2 09:12:45 2017
@@ -1,3 +1,9 @@
+Changes from 1.8.2 to 1.8.4
+---------------------------
+
+** Bug
+ * [FELIX-5576] - SCR components and factoryPids random issues
+
Changes from 1.8 to 1.8.2
---------------------------
Modified:
felix/branches/scr-1.8.x/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
URL:
http://svn.apache.org/viewvc/felix/branches/scr-1.8.x/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java?rev=1785091&r1=1785090&r2=1785091&view=diff
==============================================================================
---
felix/branches/scr-1.8.x/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
(original)
+++
felix/branches/scr-1.8.x/src/main/java/org/apache/felix/scr/impl/config/ConfigurationSupport.java
Thu Mar 2 09:12:45 2017
@@ -357,8 +357,8 @@ public class ConfigurationSupport implem
//this is a better match, delete old before
setting new
componentHolder.configurationDeleted(
pid.getServicePid() );
}
- componentHolder.configurationUpdated(
pid.getServicePid(), configInfo.getProps(),
- configInfo.getChangeCount(), pid );
+ componentHolder.configurationUpdated(
targetedPid.getServicePid(), configInfo.getProps(),
+ configInfo.getChangeCount(), targetedPid );
}
}
//else worse match, do nothing
