You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by dj...@apache.org on 2012/10/03 21:31:41 UTC
svn commit: r1393712 - in
/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager:
AbstractComponentManager.java DependencyManager.java
ImmediateComponentManager.java
Author: djencks
Date: Wed Oct 3 19:31:40 2012
New Revision: 1393712
URL: http://svn.apache.org/viewvc?rev=1393712&view=rev
Log:
logging improvements
Modified:
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.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/manager/AbstractComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java?rev=1393712&r1=1393711&r2=1393712&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java Wed Oct 3 19:31:40 2012
@@ -388,6 +388,11 @@ public abstract class AbstractComponentM
}
}
}
+
+ public String toString()
+ {
+ return "Async Activate: " + getComponentMetadata().getName();
+ }
} );
}
}
@@ -442,6 +447,12 @@ public abstract class AbstractComponentM
}
}
}
+
+ public String toString()
+ {
+ return "Async Deactivate: " + getComponentMetadata().getName();
+ }
+
} );
}
}
@@ -775,7 +786,7 @@ public abstract class AbstractComponentM
if ( sr != null && m_serviceRegistration.compareAndSet( sr, null ) )
{
- log( LogService.LOG_DEBUG, "Unregistering the services", null );
+ log( LogService.LOG_DEBUG, "Unregistering services", null );
sr.unregister();
}
}
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=1393712&r1=1393711&r2=1393712&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 Wed Oct 3 19:31:40 2012
@@ -1500,4 +1500,10 @@ public class DependencyManager implement
{
return m_targetFilter == null || m_targetFilter.match( ref );
}
+
+
+ public String toString()
+ {
+ return "DependencyManager: Component [" + m_componentManager + "] reference [" + m_dependencyMetadata.getName() + "]";
+ }
}
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=1393712&r1=1393711&r2=1393712&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 Oct 3 19:31:40 2012
@@ -636,6 +636,10 @@ public class ImmediateComponentManager e
}
catch ( IllegalStateException e )
{
+ log(
+ LogService.LOG_INFO,
+ "Could not obtain all required dependencies, getService returning null",
+ null );
release = false;
return null;
}