You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@aries.apache.org by gn...@apache.org on 2011/02/21 13:40:13 UTC

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

Author: gnodet
Date: Mon Feb 21 12:40:13 2011
New Revision: 1072950

URL: http://svn.apache.org/viewvc?rev=1072950&view=rev
Log:
ARIES-576 Fix the grace period support that I broke by accidentally leaving in my workaround so I didn't have to wait 5 minutes to see if my fix worked.

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=1072950&r1=1072949&r2=1072950&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:40:13 2011
@@ -281,7 +281,7 @@ public class BlueprintContainerImpl impl
                                 }
                             }
                         };
-                        timeoutFuture = executors.schedule(r, 10, TimeUnit.SECONDS);
+                        timeoutFuture = executors.schedule(r, timeout, TimeUnit.MILLISECONDS);
                         state = State.WaitForInitialReferences;
                         break;
                     case WaitForInitialReferences: