Author: djencks
Date: Wed Jan 27 01:48:08 2016
New Revision: 1726931
URL: http://svn.apache.org/viewvc?rev=1726931&view=rev
Log:
FELIX-5174 log configuration change count when a configuration is processed
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/RegionConfigurationSupport.java
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java?rev=1726931&r1=1726930&r2=1726931&view=diff
==============================================================================
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/ConfigurableComponentHolder.java
Wed Jan 27 01:48:08 2016
@@ -344,8 +344,8 @@ public class ConfigurableComponentHolder
*/
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>>();
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/RegionConfigurationSupport.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/RegionConfigurationSupport.java?rev=1726931&r1=1726930&r2=1726931&view=diff
==============================================================================
---
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/RegionConfigurationSupport.java
(original)
+++
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config/RegionConfigurationSupport.java
Wed Jan 27 01:48:08 2016
@@ -170,8 +170,8 @@ public class RegionConfigurationSupport
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 @@ public class RegionConfigurationSupport
{
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 @@ public class RegionConfigurationSupport
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 @@ public class RegionConfigurationSupport
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)
{
