geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r908126 - /geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
Date Tue, 09 Feb 2010 17:45:11 GMT
Author: gawor
Date: Tue Feb  9 17:45:10 2010
New Revision: 908126

URL: http://svn.apache.org/viewvc?rev=908126&view=rev
Log:
COLLISION property should be set to contextPath

Modified:
    geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java

Modified: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java?rev=908126&r1=908125&r2=908126&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
(original)
+++ geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
Tue Feb  9 17:45:10 2010
@@ -145,10 +145,7 @@
             return;
         }
         Dictionary<String, Object> props = createDefaultProperties(bundle, contextPath);
-        /*
-         * XXX: The specification doesn't exactly say what type of COLLISION and COLLISION_BUNDLES
are
-         */
-        props.put(WebContainerConstants.COLLISION, Boolean.TRUE);
+        props.put(WebContainerConstants.COLLISION, contextPath);
         props.put(WebContainerConstants.COLLISION_BUNDLES, bundleId);
         eventAdmin.postEvent(new Event(WebContainerConstants.TOPIC_FAILED, props));
     }



Mime
View raw message