svn commit: r800240 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java

[fmeschbe]

Author: fmeschbe
Date: Mon Aug  3 07:44:32 2009
New Revision: 800240

URL: http://svn.apache.org/viewvc?rev=800240&view=rev
Log:
Explicitaly address super class method

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

Modified: 
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java?rev=800240&r1=800239&r2=800240&view=diff
==============================================================================
--- 
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
 (original)
+++ 
felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
 Mon Aug  3 07:44:32 2009
@@ -419,11 +419,9 @@
                 dcm.changeState( Active.getInstance() );
                 return dcm.getInstance();
             }
-            else
-            {
-                deactivateInternal( dcm, 
ComponentConstants.DEACTIVATION_REASON_UNSPECIFIED );
-                return null;
-            }
+
+            super.deactivateInternal( dcm, 
ComponentConstants.DEACTIVATION_REASON_UNSPECIFIED );
+            return null;
         }
     }