Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 33132 invoked from network); 9 Feb 2010 22:16:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Feb 2010 22:16:05 -0000 Received: (qmail 91260 invoked by uid 500); 9 Feb 2010 22:16:05 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 91217 invoked by uid 500); 9 Feb 2010 22:16:05 -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 91208 invoked by uid 99); 9 Feb 2010 22:16:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Feb 2010 22:16:05 +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; Tue, 09 Feb 2010 22:16:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 21DBF238888F; Tue, 9 Feb 2010 22:15:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r908256 - /geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java Date: Tue, 09 Feb 2010 22:15:44 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100209221544.21DBF238888F@eris.apache.org> Author: gawor Date: Tue Feb 9 22:15:43 2010 New Revision: 908256 URL: http://svn.apache.org/viewvc?rev=908256&view=rev Log: add deployed and colliding bundle to the collision list Modified: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java Modified: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java?rev=908256&r1=908255&r2=908256&view=diff ============================================================================== --- geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java (original) +++ geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java Tue Feb 9 22:15:43 2010 @@ -245,6 +245,7 @@ eventDispatcher.deploying(bundle, contextPath); List bundleIds = new ArrayList(); bundleIds.add(deployedApp.getBundle().getBundleId()); + bundleIds.add(bundle.getBundleId()); eventDispatcher.collision(bundle, contextPath, bundleIds); LOGGER.warn("WAB {} cannot be deployed. WAB {} is already deployed with {} Context-Path.", new Object[] {bundle, deployedApp.getBundle(), contextPath});