Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C11AB18C62 for ; Wed, 27 Jan 2016 01:48:11 +0000 (UTC) Received: (qmail 81661 invoked by uid 500); 27 Jan 2016 01:48:11 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 81618 invoked by uid 500); 27 Jan 2016 01:48:11 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 81609 invoked by uid 99); 27 Jan 2016 01:48:11 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jan 2016 01:48:11 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 2D169180047 for ; Wed, 27 Jan 2016 01:48:11 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.246 X-Spam-Level: * X-Spam-Status: No, score=1.246 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id LctP3JesNSr5 for ; Wed, 27 Jan 2016 01:48:09 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id 8663942BD1 for ; Wed, 27 Jan 2016 01:48:09 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 01351E043F for ; Wed, 27 Jan 2016 01:48:08 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E37E83A0056 for ; Wed, 27 Jan 2016 01:48:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1726931 - in /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/config: ConfigurableComponentHolder.java RegionConfigurationSupport.java Date: Wed, 27 Jan 2016 01:48:08 -0000 To: commits@felix.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160127014808.E37E83A0056@svn01-us-west.apache.org> 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 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, Map> scms = new HashMap< AbstractComponentManager, Map>(); 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) {