SLING-1162 Move m_size field setup to the enable method
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@778505 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/DependencyManager.java b/scr/src/main/java/org/apache/felix/scr/impl/DependencyManager.java
index 0b40681..c436654 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/DependencyManager.java
@@ -106,13 +106,9 @@
// setup the target filter from component descriptor
setTargetFilter( m_dependencyMetadata.getTarget() );
- // get the current number of registered services available
- ServiceReference refs[] = getFrameworkServiceReferences();
- m_size = ( refs == null ) ? 0 : refs.length;
-
m_componentManager.log( LogService.LOG_DEBUG, "Dependency Manager " + getName() + " created: filter="
- + getTarget() + ", interface=" + m_dependencyMetadata.getInterface() + ",matching services=" + m_size,
- m_componentManager.getComponentMetadata(), null );
+ + getTarget() + ", interface=" + m_dependencyMetadata.getInterface(), m_componentManager
+ .getComponentMetadata(), null );
}
@@ -431,9 +427,16 @@
*/
void enable() throws InvalidSyntaxException
{
+ // get the current number of registered services available
+ ServiceReference refs[] = getFrameworkServiceReferences();
+ m_size = ( refs == null ) ? 0 : refs.length;
+
// register the service listener
String filterString = "(" + Constants.OBJECTCLASS + "=" + m_dependencyMetadata.getInterface() + ")";
m_componentManager.getActivator().getBundleContext().addServiceListener( this, filterString );
+
+ m_componentManager.log( LogService.LOG_DEBUG, "Registered for service events, currently " + m_size
+ + " service(s) match the filter", m_componentManager.getComponentMetadata(), null );
}
/**