You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/02/09 23:15:44 UTC

svn commit: r908256 - /geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java

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<Long> bundleIds = new ArrayList<Long>();
             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});