From scm-return-46620-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Fri Jul 1 19:06:31 2011 Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BE1AD4180 for ; Fri, 1 Jul 2011 19:06:31 +0000 (UTC) Received: (qmail 95420 invoked by uid 500); 1 Jul 2011 19:06:31 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 95337 invoked by uid 500); 1 Jul 2011 19:06:30 -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 95330 invoked by uid 99); 1 Jul 2011 19:06:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jul 2011 19:06:30 +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; Fri, 01 Jul 2011 19:06:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 51855238896F; Fri, 1 Jul 2011 19:06:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1142027 - /geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java Date: Fri, 01 Jul 2011 19:06:07 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110701190607.51855238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Fri Jul 1 19:06:06 2011 New Revision: 1142027 URL: http://svn.apache.org/viewvc?rev=1142027&view=rev Log: GERONIMO-6042: do wab deploy under ConfigurationManager lock - to ensure the locks are obtained in the same order Modified: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java Modified: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java?rev=1142027&r1=1142026&r2=1142027&view=diff ============================================================================== --- geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java (original) +++ geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java Fri Jul 1 19:06:06 2011 @@ -118,13 +118,15 @@ public class WebApplication implements R public void run() { scheduled.set(false); synchronized (scheduled) { - synchronized (running) { - running.set(true); - try { - doRun(); - } finally { - running.set(false); - running.notifyAll(); + synchronized (extender.getConfigurationManager()) { + synchronized (running) { + running.set(true); + try { + doRun(); + } finally { + running.set(false); + running.notifyAll(); + } } } }