Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 9037 invoked from network); 18 Jun 2009 20:27:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Jun 2009 20:27:08 -0000 Received: (qmail 56214 invoked by uid 500); 18 Jun 2009 20:27:19 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 56119 invoked by uid 500); 18 Jun 2009 20:27:19 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 56110 invoked by uid 99); 18 Jun 2009 20:27:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jun 2009 20:27:19 +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; Thu, 18 Jun 2009 20:27:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1EE232388893; Thu, 18 Jun 2009 20:26:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r786248 - in /geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint: container/ServiceRecipe.java di/Repository.java Date: Thu, 18 Jun 2009 20:26:56 -0000 To: scm@geronimo.apache.org From: gnodet@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090618202657.1EE232388893@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gnodet Date: Thu Jun 18 20:26:56 2009 New Revision: 786248 URL: http://svn.apache.org/viewvc?rev=786248&view=rev Log: Fix synchronization problem on services again Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/Repository.java Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java?rev=786248&r1=786247&r2=786248&view=diff ============================================================================== --- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java (original) +++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java Thu Jun 18 20:26:56 2009 @@ -213,7 +213,7 @@ */ private Object internalGetService(Bundle bundle, ServiceRegistration registration) { LOGGER.debug("Retrieving service for bundle {} and service registration {}", bundle, registration); - synchronized (serviceLock) { + synchronized (blueprintContainer.getRepository().getInstanceLock()) { // Create initial service if (this.service == null) { try { Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/Repository.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/Repository.java?rev=786248&r1=786247&r2=786248&view=diff ============================================================================== --- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/Repository.java (original) +++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/di/Repository.java Thu Jun 18 20:26:56 2009 @@ -73,4 +73,10 @@ void destroy(); + /** + * Lock that should be used to synchronized creation of singletons + * + * @return + */ + public Object getInstanceLock(); }