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 1D850D3A4 for ; Thu, 20 Dec 2012 04:54:22 +0000 (UTC) Received: (qmail 31159 invoked by uid 500); 20 Dec 2012 04:54:22 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 31135 invoked by uid 500); 20 Dec 2012 04:54:21 -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 31114 invoked by uid 99); 20 Dec 2012 04:54:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Dec 2012 04:54:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Dec 2012 04:54:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C44412388847; Thu, 20 Dec 2012 04:53:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1424322 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java Date: Thu, 20 Dec 2012 04:53:59 -0000 To: commits@felix.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121220045359.C44412388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Thu Dec 20 04:53:59 2012 New Revision: 1424322 URL: http://svn.apache.org/viewvc?rev=1424322&view=rev Log: FELIX-3729 clean up excessive logging Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java?rev=1424322&r1=1424321&r2=1424322&view=diff ============================================================================== --- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java (original) +++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java Thu Dec 20 04:53:59 2012 @@ -316,7 +316,6 @@ public class DependencyManager imp public void addedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} MultipleDynamic added {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); if ( getPreviousRefMap().remove( serviceReference ) == null ) { if (isActive()) @@ -340,7 +339,6 @@ public class DependencyManager imp public void modifiedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} MultipleDynamic modified {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); if (isActive()) { m_componentManager.update( DependencyManager.this, refPair, trackingCount ); @@ -351,7 +349,6 @@ public class DependencyManager imp public void removedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} MultipleDynamic removed (unbind) {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); if ( isActive() ) { boolean unbind = isOptional() || !getTracker().isEmpty(); @@ -373,6 +370,7 @@ public class DependencyManager imp } else { + m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} MultipleDynamic removed (inactive) {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); tracked( trackingCount ); } ungetService( refPair ); @@ -440,7 +438,6 @@ public class DependencyManager imp public void addedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} MultipleStaticGreedy added {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); tracked( trackingCount ); if (isActive()) { @@ -460,7 +457,6 @@ public class DependencyManager imp public void modifiedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} MultipleStaticGreedy modified {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); if (isActive()) { m_componentManager.update( DependencyManager.this, refPair, trackingCount ); @@ -471,7 +467,6 @@ public class DependencyManager imp public void removedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} MultipleStaticGreedy removed {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); tracked( trackingCount ); if ( isActive() ) { @@ -532,7 +527,6 @@ public class DependencyManager imp public void addedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} MultipleStaticReluctant added {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); if ( isTrackerOpened() && !isOptional() && !isActive()) { m_componentManager.activateInternal( trackingCount ); @@ -543,7 +537,6 @@ public class DependencyManager imp public void modifiedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} MultipleStaticReluctant modified {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); if (isActive()) { m_componentManager.update( DependencyManager.this, refPair, trackingCount ); @@ -554,7 +547,6 @@ public class DependencyManager imp public void removedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} MultipleStaticReluctant removed {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); tracked( trackingCount ); if ( isActive() ) { @@ -627,7 +619,6 @@ public class DependencyManager imp public void addedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} SingleDynamic added {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); if ( getPreviousRefMap().get( serviceReference ) == null ) { if (isActive() ) @@ -666,7 +657,6 @@ public class DependencyManager imp public void modifiedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} SingleDynamic modified {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); if (isActive()) { m_componentManager.update( DependencyManager.this, refPair, trackingCount ); @@ -678,7 +668,6 @@ public class DependencyManager imp public void removedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} SingleDynamic removed {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); if (refPair == this.refPair) { if ( isActive() ) @@ -793,7 +782,6 @@ public class DependencyManager imp public void addedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} SingleStatic added {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); if ( isActive() ) { if ( !isReluctant() && ( this.refPair == null || refPair.getRef().compareTo( this.refPair.getRef() ) > 0 ) ) @@ -826,7 +814,6 @@ public class DependencyManager imp public void modifiedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} SingleStatic modified {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); if ( isActive() ) { m_componentManager.update( DependencyManager.this, refPair, trackingCount ); @@ -839,7 +826,6 @@ public class DependencyManager imp public void removedService( ServiceReference serviceReference, RefPair refPair, int trackingCount ) { this.trackingCount = trackingCount; - m_componentManager.log( LogService.LOG_DEBUG, "dm {0} tracking {1} SingleStatic removed {2}", new Object[] {m_dependencyMetadata.getName(), trackingCount, serviceReference}, null ); tracked( trackingCount ); if ( isActive() && refPair == this.refPair ) {