Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 83422 invoked from network); 16 Oct 2010 19:27:26 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Oct 2010 19:27:26 -0000 Received: (qmail 81839 invoked by uid 500); 16 Oct 2010 19:27:26 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 81779 invoked by uid 500); 16 Oct 2010 19:27:25 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 81772 invoked by uid 99); 16 Oct 2010 19:27:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Oct 2010 19:27:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sat, 16 Oct 2010 19:27:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2ACB42388B4E; Sat, 16 Oct 2010 19:26:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1023358 - /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ComponentImpl.java Date: Sat, 16 Oct 2010 19:26:26 -0000 To: commits@felix.apache.org From: pderop@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101016192626.2ACB42388B4E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pderop Date: Sat Oct 16 19:26:25 2010 New Revision: 1023358 URL: http://svn.apache.org/viewvc?rev=1023358&view=rev Log: Fetch again the current state in the add(List) method, just before invoking calculateStateChanges method. Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ComponentImpl.java Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ComponentImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ComponentImpl.java?rev=1023358&r1=1023357&r2=1023358&view=diff ============================================================================== --- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ComponentImpl.java (original) +++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/ComponentImpl.java Sat Oct 16 19:26:25 2010 @@ -309,6 +309,7 @@ public class ComponentImpl implements Co } synchronized (m_dependencies) { + oldState = m_state; // starting the dependency above might have triggered another state change, so // we have to fetch the current state again newState = new State((List) m_dependencies.clone(), !oldState.isInactive(), m_isInstantiated, m_isBound);