Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 149DD1893D for ; Wed, 4 Nov 2015 06:43:44 +0000 (UTC) Received: (qmail 53173 invoked by uid 500); 4 Nov 2015 06:43:44 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 53102 invoked by uid 500); 4 Nov 2015 06:43:43 -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 53093 invoked by uid 99); 4 Nov 2015 06:43:43 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Nov 2015 06:43:43 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 636CEC0FC5 for ; Wed, 4 Nov 2015 06:43:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id a7Nlb0hay1Sk for ; Wed, 4 Nov 2015 06:43:35 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id 71EE94448A for ; Wed, 4 Nov 2015 06:43:35 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id E8F2AE00B0 for ; Wed, 4 Nov 2015 06:43:34 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id BFA193A03CC for ; Wed, 4 Nov 2015 06:43:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1712478 - in /felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl: CoordinationHolder.java CoordinationImpl.java CoordinationMgr.java CoordinatorImpl.java Date: Wed, 04 Nov 2015 06:43:34 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151104064334.BFA193A03CC@svn01-us-west.apache.org> Author: cziegeler Date: Wed Nov 4 06:43:34 2015 New Revision: 1712478 URL: http://svn.apache.org/viewvc?rev=1712478&view=rev Log: FELIX-5086 : Coordinator.begin can return null Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationHolder.java felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationHolder.java URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationHolder.java?rev=1712478&r1=1712477&r2=1712478&view=diff ============================================================================== --- felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationHolder.java (original) +++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationHolder.java Wed Nov 4 06:43:34 2015 @@ -35,10 +35,11 @@ import org.osgi.service.coordinator.Part */ public class CoordinationHolder implements Coordination { - private final CoordinationImpl coordination; + private CoordinationImpl coordination; - public CoordinationHolder(final CoordinationImpl coordination) { - this.coordination = coordination; + public void setCoordination(final CoordinationImpl coordination) + { + this.coordination = coordination; } /** Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java?rev=1712478&r1=1712477&r2=1712478&view=diff ============================================================================== --- felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java (original) +++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationImpl.java Wed Nov 4 06:43:34 2015 @@ -80,7 +80,19 @@ public class CoordinationImpl implements private final Object waitLock = new Object(); - public CoordinationImpl(final CoordinatorImpl owner, final long id, final String name, final long timeOutInMs) + public static CoordinationMgr.CreationResult create(final CoordinatorImpl owner, final long id, final String name, final long timeOutInMs) + { + final CoordinationMgr.CreationResult result = new CoordinationMgr.CreationResult(); + result.holder = new CoordinationHolder(); + result.coordination = new CoordinationImpl(owner, id, name, timeOutInMs, result.holder); + return result; + } + + private CoordinationImpl(final CoordinatorImpl owner, + final long id, + final String name, + final long timeOutInMs, + final CoordinationHolder holder) { this.owner = owner; this.id = id; @@ -89,8 +101,8 @@ public class CoordinationImpl implements this.participants = new ArrayList(); this.variables = new HashMap, Object>(); this.deadLine = (timeOutInMs > 0) ? System.currentTimeMillis() + timeOutInMs : 0; - - this.holderRef = new WeakReference(new CoordinationHolder(this)); + holder.setCoordination(this); + this.holderRef = new WeakReference(holder); scheduleTimeout(deadLine); } Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java?rev=1712478&r1=1712477&r2=1712478&view=diff ============================================================================== --- felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java (original) +++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinationMgr.java Wed Nov 4 06:43:34 2015 @@ -42,6 +42,11 @@ import org.osgi.service.coordinator.Part */ public class CoordinationMgr { + public static final class CreationResult + { + public CoordinationImpl coordination; + public CoordinationHolder holder; + } private ThreadLocal> perThreadStack; @@ -190,15 +195,15 @@ public class CoordinationMgr // ---------- Coordinator back end implementation - CoordinationImpl create(final CoordinatorImpl owner, final String name, final long timeout) + CreationResult create(final CoordinatorImpl owner, final String name, final long timeout) { final long id = ctr.incrementAndGet(); - final CoordinationImpl c = new CoordinationImpl(owner, id, name, timeout); + final CreationResult result = CoordinationImpl.create(owner, id, name, timeout); synchronized ( this.coordinations ) { - coordinations.put(id, c); + coordinations.put(id, result.coordination); } - return c; + return result; } void unregister(final CoordinationImpl c, final boolean removeFromThread) Modified: felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java?rev=1712478&r1=1712477&r2=1712478&view=diff ============================================================================== --- felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java (original) +++ felix/trunk/coordinator/src/main/java/org/apache/felix/coordinator/impl/CoordinatorImpl.java Wed Nov 4 06:43:34 2015 @@ -151,9 +151,9 @@ public class CoordinatorImpl implements } // create coordination - final CoordinationImpl c = mgr.create(this, name, timeout); + final CoordinationMgr.CreationResult result = mgr.create(this, name, timeout); - return c.getHolder(); + return result.holder; } /** @@ -218,9 +218,9 @@ public class CoordinatorImpl implements } // create coordination - final CoordinationImpl c = mgr.create(this, name, timeout); - this.mgr.push(c); - return c.getHolder(); + final CoordinationMgr.CreationResult result = mgr.create(this, name, timeout); + this.mgr.push(result.coordination); + return result.holder; } /**