Return-Path: Delivered-To: apmail-aries-commits-archive@www.apache.org Received: (qmail 30942 invoked from network); 21 Feb 2011 12:41:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Feb 2011 12:41:55 -0000 Received: (qmail 56310 invoked by uid 500); 21 Feb 2011 12:41:55 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 56254 invoked by uid 500); 21 Feb 2011 12:41:55 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 56245 invoked by uid 99); 21 Feb 2011 12:41:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Feb 2011 12:41:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Feb 2011 12:41:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CE2752388A40; Mon, 21 Feb 2011 12:41:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1072952 - /aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java Date: Mon, 21 Feb 2011 12:41:31 -0000 To: commits@aries.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110221124131.CE2752388A40@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gnodet Date: Mon Feb 21 12:41:31 2011 New Revision: 1072952 URL: http://svn.apache.org/viewvc?rev=1072952&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.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java Modified: aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java URL: http://svn.apache.org/viewvc/aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java?rev=1072952&r1=1072951&r2=1072952&view=diff ============================================================================== --- aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java (original) +++ aries/branches/0.3-RCx/blueprint/blueprint-core/src/main/java/org/apache/aries/blueprint/container/BlueprintContainerImpl.java Mon Feb 21 12:41:31 2011 @@ -295,7 +295,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: