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 2013/05/07 21:16:21 UTC
svn commit: r1480029 -
/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
Author: djencks
Date: Tue May 7 19:16:21 2013
New Revision: 1480029
URL: http://svn.apache.org/r1480029
Log:
FELIX-4055 don't rely on correct state when getting or ungetting service
Modified:
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/ImmediateComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java?rev=1480029&r1=1480028&r2=1480029&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 Tue May 7 19:16:21 2013
@@ -763,7 +763,7 @@ public class ImmediateComponentManager<S
if ( m_componentContext == null )
{
//state should be "Registered"
- S result = (S) state().getService( this );
+ S result = (S) Registered.getInstance().getService( this );
if ( result == null )
{
success = false;;
@@ -802,7 +802,7 @@ public class ImmediateComponentManager<S
{
if ( m_useCount.get() == 0 )
{
- state().ungetService( this );
+ Active.getInstance().ungetService( this );
unsetDependenciesCollected();
}
}