FELIX-5174 log configuration change count when a configuration is processed
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1726931 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
index 55d549c..9b32df6 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
@@ -344,8 +344,8 @@
*/
public boolean configurationUpdated( TargetedPID pid, TargetedPID factoryPid, final Dictionary<String, Object> props, long changeCount )
{
- log( LogService.LOG_DEBUG, "ConfigurableComponentHolder configuration updated for pid {0} with properties {1}",
- new Object[] {pid, props}, null);
+ log( LogService.LOG_DEBUG, "ConfigurableComponentHolder configuration updated for pid {0} with properties {1} and change count {2}",
+ new Object[] {pid, props, changeCount}, null);
// component to update or create
final Map<AbstractComponentManager<S>, Map<String, Object>> scms = new HashMap< AbstractComponentManager<S>, Map<String, Object>>();
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/config/RegionConfigurationSupport.java b/scr/src/main/java/org/apache/felix/scr/impl/config/RegionConfigurationSupport.java
index 1c438a9..81e101f 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/config/RegionConfigurationSupport.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/config/RegionConfigurationSupport.java
@@ -170,8 +170,8 @@
for ( Configuration config: factory )
{
Activator.log( LogService.LOG_DEBUG, null,
- "Configuring holder {0} with factory configuration {1}", new Object[] {
- holder, config }, null );
+ "Configuring holder {0} with factory configuration {1}, change count {2}", new Object[] {
+ holder, config, config.getChangeCount() }, null );
config = getConfiguration( ca, config.getPid() );
if ( checkBundleLocation( config, bundleContext.getBundle() ) )
{
@@ -196,8 +196,8 @@
{
singleton = getConfiguration( ca, singleton.getPid() );
Activator.log( LogService.LOG_DEBUG, null,
- "Configuring holder {0} with configuration {1}", new Object[] { holder,
- singleton }, null );
+ "Configuring holder {0} with configuration {1}, change count {2}", new Object[] { holder,
+ singleton, singleton.getChangeCount() }, null );
if ( singleton != null
&& checkBundleLocation( singleton, bundleContext.getBundle() ) )
{
@@ -360,8 +360,8 @@
final ConfigurationInfo configInfo = getConfigurationInfo( pid, targetedPid, componentHolder, bundleContext );
if ( configInfo != null )
{
- Activator.log(LogService.LOG_DEBUG, null, "LocationChanged event, same targetedPID {0}, location now {1}",
- new Object[] {targetedPid, configInfo.getBundleLocation()},
+ Activator.log(LogService.LOG_DEBUG, null, "LocationChanged event, same targetedPID {0}, location now {1}, change count {2}",
+ new Object[] {targetedPid, configInfo.getBundleLocation(), configInfo.getChangeCount()},
null);
if (configInfo.getProps() == null)
{
@@ -389,8 +389,8 @@
final ConfigurationInfo configInfo = getConfigurationInfo( pid, targetedPid, componentHolder, bundleContext );
if ( configInfo != null )
{
- Activator.log(LogService.LOG_DEBUG, null, "LocationChanged event, better targetedPID {0} compared to {1}, location now {2}",
- new Object[] {targetedPid, oldTargetedPID, configInfo.getBundleLocation()},
+ Activator.log(LogService.LOG_DEBUG, null, "LocationChanged event, better targetedPID {0} compared to {1}, location now {2}, change count {3}",
+ new Object[] {targetedPid, oldTargetedPID, configInfo.getBundleLocation(), configInfo.getChangeCount()},
null);
if (configInfo.getProps() == null)
{