felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1390590 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
Date Wed, 26 Sep 2012 16:23:52 GMT
Author: djencks
Date: Wed Sep 26 16:23:52 2012
New Revision: 1390590

URL: http://svn.apache.org/viewvc?rev=1390590&view=rev
Log:
FELIX-3676 fix misleading logging by checking for instance, not count

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java?rev=1390590&r1=1390589&r2=1390590&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
Wed Sep 26 16:23:52 2012
@@ -611,7 +611,7 @@ public class ImmediateComponentManager e
         boolean release = obtainReadLock( "ImmediateComponentManager.getService.1" );
         try
         {
-            if ( m_useCount == 0 )
+            if ( m_implementationObject == null )
             {
                 releaseReadLock( "ImmediateComponentManager.getService.1" );
                 try
@@ -619,7 +619,7 @@ public class ImmediateComponentManager e
                     if ( !collectDependencies() )
                     {
                         log(
-                                LogService.LOG_INFO,
+                                LogService.LOG_DEBUG,
                                 "getService did not win collecting dependencies, try creating
object anyway.",
                                 null );
 
@@ -641,7 +641,7 @@ public class ImmediateComponentManager e
                 obtainWriteLock( "ImmediateComponentManager.getService.1" );
                 try
                 {
-                    if ( m_useCount == 0 )
+                    if ( m_implementationObject == null )
                     {
                         //state should be "Registered"
                         Object result = state().getService( this );



Mime
View raw message