FELIX-1185 "satisfied" state of a service factory component
is "registered" (like the delayed service component) and not
"factory" (which is only used factory components).
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@781335 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/ServiceFactoryComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/ServiceFactoryComponentManager.java
index fc79eb8..05db1dd 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/ServiceFactoryComponentManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/ServiceFactoryComponentManager.java
@@ -93,7 +93,7 @@
*/
public Object getService( Bundle bundle, ServiceRegistration registration )
{
- log( LogService.LOG_DEBUG, "DelayedServiceFactoryServiceFactory.getService()", getComponentMetadata(), null );
+ log( LogService.LOG_DEBUG, "ServiceFactory.getService()", getComponentMetadata(), null );
// When the getServiceMethod is called, the implementation object must be created
@@ -108,11 +108,11 @@
serviceContexts.put( service, serviceContext );
// if this is the first use of this component, switch to ACTIVE state
- if (getState() == STATE_FACTORY)
+ if (getState() == STATE_REGISTERED)
{
synchronized(this)
{
- if (getState() == STATE_FACTORY)
+ if (getState() == STATE_REGISTERED)
{
changeState(Active.getInstance());
}
@@ -129,7 +129,7 @@
*/
public void ungetService( Bundle bundle, ServiceRegistration registration, Object service )
{
- log( LogService.LOG_DEBUG, "DelayedServiceFactoryServiceFactory.ungetService()", getComponentMetadata(), null );
+ log( LogService.LOG_DEBUG, "ServiceFactory.ungetService()", getComponentMetadata(), null );
// When the ungetServiceMethod is called, the implementation object must be deactivated
@@ -146,7 +146,7 @@
{
if (getState() == STATE_ACTIVE)
{
- changeState(Factory.getInstance());
+ changeState(Registered.getInstance());
}
}
}