svn commit: r573189 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/AbstractComponentManager.java

[fmeschbe]

Author: fmeschbe
Date: Thu Sep  6 02:03:11 2007
New Revision: 573189

URL: http://svn.apache.org/viewvc?rev=573189&view=rev
Log:
FELIX-357 activation and deactivation may run concurrently

Modified:
    
felix/trunk/scr/src/main/java/org/apache/felix/scr/AbstractComponentManager.java

Modified: 
felix/trunk/scr/src/main/java/org/apache/felix/scr/AbstractComponentManager.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/AbstractComponentManager.java?rev=573189&r1=573188&r2=573189&view=diff
==============================================================================
--- 
felix/trunk/scr/src/main/java/org/apache/felix/scr/AbstractComponentManager.java
 (original)
+++ 
felix/trunk/scr/src/main/java/org/apache/felix/scr/AbstractComponentManager.java
 Thu Sep  6 02:03:11 2007
@@ -299,7 +299,7 @@
      *   4. Call the activate method, if present
      *   [5. Register provided services]
      */
-    private void activateInternal()
+    private synchronized void activateInternal()
     {
         // CONCURRENCY NOTE: This method is only called from within the
         //     ComponentActorThread to enable, activate or reactivate the
@@ -315,6 +315,7 @@
         {
             getActivator().log( LogService.LOG_DEBUG,
                 "Component cannot be activated because the Activator is being 
disposed", m_componentMetadata, null );
+            setState( STATE_UNSATISFIED );
             return;
         }
 
@@ -372,13 +373,13 @@
      * 2. Unbind any bound services
      * 3. Release references to the component instance and component context
     **/
-    private void deactivateInternal()
+    private synchronized void deactivateInternal()
     {
         // CONCURRENCY NOTE: This method may be called either from the
         //     ComponentActorThread to handle application induced disabling or
         //     as a result of an unsatisfied service dependency leading to
         //     component deactivation. We therefore have to guard against
-        //     paralell state changes.from application
+        //     paralell state changes.
         if ( !setStateConditional( STATE_ACTIVATING | STATE_ACTIVE | 
STATE_REGISTERED | STATE_FACTORY,
             STATE_DEACTIVATING ) )
         {