You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2015/10/11 21:21:51 UTC

svn commit: r1708013 - /aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java

Author: cschneider
Date: Sun Oct 11 19:21:50 2015
New Revision: 1708013

URL: http://svn.apache.org/viewvc?rev=1708013&view=rev
Log:
[ARIES-1430] Workaround for the timeout with no unresolved deps

Modified:
    aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java

Modified: aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1708013&r1=1708012&r2=1708013&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java (original)
+++ aries/trunk/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java Sun Oct 11 19:21:50 2015
@@ -336,9 +336,12 @@ public class BlueprintContainerImpl
                                     if (destroyed.get()) {
                                         return;
                                     }
+                                    String[] missingDependecies = getMissingDependencies();
+                                    if (missingDependecies.length == 0) {
+                                        return;
+                                    }
                                     Throwable t = new TimeoutException();
                                     state = State.Failed;
-                                    String[] missingDependecies = getMissingDependencies();
                                     tidyupComponents();
                                     LOGGER.error("Unable to start blueprint container for bundle {}/{} due to unresolved dependencies {}", getBundle().getSymbolicName(), getBundle().getVersion(), Arrays.asList(missingDependecies), t);
                                     eventDispatcher.blueprintEvent(new BlueprintEvent(BlueprintEvent.FAILURE, getBundle(), getExtenderBundle(), missingDependecies, t));