svn commit: r1072949 - /aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java

[gn...@apache.org]

Author: gnodet
Date: Mon Feb 21 12:38:03 2011
New Revision: 1072949

URL: http://svn.apache.org/viewvc?rev=1072949&view=rev
Log:
ARIES-576 move the call to getMissingDependencies so it occurs prior to cleanup of ReferenceRecepies. The previous position occurred after the ReferenceRecepies had been stopped
so they all reported themselves as missing, even if they had not been missing.

Modified:
    aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java

Modified: aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL: http://svn.apache.org/viewvc/aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1072949&r1=1072948&r2=1072949&view=diff
==============================================================================
--- aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java (original)
+++ aries/branches/0.2-incubating-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java Mon Feb 21 12:38:03 2011
@@ -272,16 +272,16 @@ public class BlueprintContainerImpl impl
                                 synchronized (scheduled) {
                                     Throwable t = new TimeoutException();
                                     state = State.Failed;
+                                    String[] missingDependecies = getMissingDependencies();
                                     unregisterServices();
                                     untrackServiceReferences();
                                     destroyComponents();
-                                    String[] missingDependecies = getMissingDependencies();
                                     LOGGER.error("Unable to start blueprint container for bundle " + bundleContext.getBundle().getSymbolicName() + " due to unresolved dependencies " + Arrays.asList(missingDependecies), t);
                                     eventDispatcher.blueprintEvent(new BlueprintEvent(BlueprintEvent.FAILURE, getBundleContext().getBundle(), getExtenderBundle(), missingDependecies, t));
                                 }
                             }
                         };
-                        timeoutFuture = executors.schedule(r, timeout, TimeUnit.MILLISECONDS);
+                        timeoutFuture = executors.schedule(r, 10, TimeUnit.SECONDS);
                         state = State.WaitForInitialReferences;
                         break;
                     case WaitForInitialReferences: