logging improvements
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1393712 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
index 0c03fe6..106431b 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
@@ -388,6 +388,11 @@
}
}
}
+
+ public String toString()
+ {
+ return "Async Activate: " + getComponentMetadata().getName();
+ }
} );
}
}
@@ -442,6 +447,12 @@
}
}
}
+
+ public String toString()
+ {
+ return "Async Deactivate: " + getComponentMetadata().getName();
+ }
+
} );
}
}
@@ -775,7 +786,7 @@
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();
}
}
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
index a904ce3..55301f4 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
@@ -1500,4 +1500,10 @@
{
return m_targetFilter == null || m_targetFilter.match( ref );
}
+
+
+ public String toString()
+ {
+ return "DependencyManager: Component [" + m_componentManager + "] reference [" + m_dependencyMetadata.getName() + "]";
+ }
}
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
index 61d2fca..680d88d 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
@@ -636,6 +636,10 @@
}
catch ( IllegalStateException e )
{
+ log(
+ LogService.LOG_INFO,
+ "Could not obtain all required dependencies, getService returning null",
+ null );
release = false;
return null;
}