svn commit: r1390588 - in /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl: helper/BaseMethod.java manager/ImmediateComponentManager.java

[dj...@apache.org]

Author: djencks
Date: Wed Sep 26 16:23:47 2012
New Revision: 1390588

URL: http://svn.apache.org/viewvc?rev=1390588&view=rev
Log:
more logging of when lifecycle methods are called and when implementation object is set/unset

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/BaseMethod.java
    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/helper/BaseMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/BaseMethod.java?rev=1390588&r1=1390587&r2=1390588&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/BaseMethod.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/helper/BaseMethod.java Wed Sep 26 16:23:47 2012
@@ -226,12 +226,16 @@ abstract class BaseMethod
     private MethodResult invokeMethod( final Object componentInstance, final Object rawParameter )
         throws InvocationTargetException
     {
+        getLogger().log( LogService.LOG_DEBUG, "invoking {0}: {1}", new Object[]
+            { getMethodNamePrefix(), getMethodName() }, null );
         try
         {
             if ( componentInstance != null )
             {
                 final Object[] params = getParameters(m_method, rawParameter);
                 Object result = m_method.invoke(componentInstance, params);
+                getLogger().log( LogService.LOG_DEBUG, "invoked {0}: {1}", new Object[]
+                    { getMethodNamePrefix(), getMethodName() }, null );
                 return new MethodResult((m_method.getReturnType() != Void.TYPE), (Map) result);
             }
             else
@@ -606,8 +610,6 @@ abstract class BaseMethod
         public MethodResult invoke( final BaseMethod baseMethod, final Object componentInstance, final Object rawParameter )
             throws InvocationTargetException
         {
-            baseMethod.getLogger().log( LogService.LOG_DEBUG, "invoking {0}: {1}", new Object[]
-                { baseMethod.getMethodNamePrefix(), baseMethod.getMethodName() }, null );
             return baseMethod.invokeMethod( componentInstance, rawParameter );
         }
 

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=1390588&r1=1390587&r2=1390588&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:47 2012
@@ -131,6 +131,7 @@ public class ImmediateComponentManager e
             // otherwise set the context and component instance and return true
             m_componentContext = tmpContext;
             m_implementationObject = tmpComponent;
+            log( LogService.LOG_DEBUG, "Set implementation object for component {0}", new Object[] { getName() },  null );
         }
         return true;
     }
@@ -147,6 +148,7 @@ public class ImmediateComponentManager e
             disposeImplementationObject( m_implementationObject, m_componentContext, reason );
             m_useCount = 0;
             m_implementationObject = null;
+            log( LogService.LOG_DEBUG, "Unset implementation object for component {0} in deleteComponent", new Object[] { getName() },  null );
             m_componentContext = null;
             m_properties = null;
             m_serviceProperties = null;