Removed empty ComponentRegistry.shutdown() method

Removed m_componentActor parameter from ComponentRegistry.missingServicePresent()

Author: glimmerveen

scr/src/main/java/org/apache/felix/scr/impl/Activator.java

@@ -422,7 +422,6 @@ public void doStop() throws Exception
         // dispose component registry
         if ( m_componentRegistry != null )
         {
-            m_componentRegistry.shutdown();
             m_componentRegistry = null;
         }
 

scr/src/main/java/org/apache/felix/scr/impl/BundleComponentActivator.java

@@ -763,7 +763,7 @@ public <T> void leaveCreate(ServiceReference<T> serviceReference)
     @Override
     public <T> void missingServicePresent(ServiceReference<T> serviceReference)
     {
-        m_componentRegistry.missingServicePresent( serviceReference, m_componentActor );
+        m_componentRegistry.missingServicePresent( serviceReference );
     }
 
     @Override

scr/src/main/java/org/apache/felix/scr/impl/ComponentRegistry.java

@@ -562,7 +562,7 @@ public <T> void leaveCreate(final ServiceReference<T> serviceReference)
      * @param serviceReference
      * @param actor
      */
-    public synchronized <T> void missingServicePresent( final ServiceReference<T> serviceReference, ScheduledExecutorService actor )
+    public synchronized <T> void missingServicePresent( final ServiceReference<T> serviceReference )
     {
         final List<Entry<?, ?>> dependencyManagers = m_missingDependencies.remove( serviceReference );
         if ( dependencyManagers != null )
@@ -592,7 +592,7 @@ public String toString()
             } ;
             m_logger.log(Level.DEBUG,
                 "Scheduling runnable {0} asynchronously", null, runnable);
-            actor.submit( runnable );
+            m_componentActor.submit( runnable );
         }
     }
 
@@ -756,8 +756,4 @@ public void run()
             }
         }
     }
-
-    public void shutdown() {
-
-    }
 }

scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java

@@ -55,6 +55,7 @@
 import javax.inject.Inject;
 
 import org.apache.felix.scr.impl.ComponentCommands;
+import org.apache.felix.scr.impl.manager.ScrConfiguration;
 import org.apache.felix.scr.integration.components.SimpleComponent;
 import org.apache.felix.service.command.Converter;
 import org.junit.After;
@@ -141,7 +142,7 @@ public abstract class ComponentTestBase
 
     protected static final String PROP_NAME_FACTORY = ComponentTestBase.PROP_NAME + ".factory";
 
-    protected static long DS_SERVICE_CHANGECOUNT_TIMEOUT = 5000;
+    protected static long DS_SERVICE_CHANGECOUNT_TIMEOUT = ScrConfiguration.DEFAULT_SERVICE_CHANGECOUNT_TIMEOUT_MILLISECONDS;
 
     static
     {

scr/src/test/java/org/apache/felix/scr/integration/Felix6778Test.java

@@ -44,7 +44,6 @@ public class Felix6778Test extends ComponentTestBase implements ServiceListener
     {
         descriptorFile = "/integration_test_simple_components.xml";
         DS_SERVICE_CHANGECOUNT_TIMEOUT = 1000;
-//        paxRunnerVmOption = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:5005";
     }
 
     class RecordedScrChangeCount