Bug 404934 - [RFC 198] system bundle and framework hooksI20130911-2000

 - Pay attention to collision hooks for system bundle

1 files changed, 7 insertions, 5 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java
index 22ea4a5d7..3046a6d2d 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/OSGiFrameworkHooks.java
@@ -80,11 +80,13 @@ class OSGiFrameworkHooks {
 		}
 
 		private void notifyCollisionHooks(final int operationType, final Bundle target, Collection<Bundle> collisionCandidates) {
-			if (operationType == CollisionHook.INSTALLING && target.getBundleId() == 0) {
-				// Make a copy of the collisions only for calling the hooks;
-				// Any removals from hooks are ignored in this case
-				collisionCandidates = new ArrayList<Bundle>(collisionCandidates);
-			}
+			// TODO open question in the specification for ignoring collision hooks for the system bundle
+			// For now we will NOT ignore them
+			//if (operationType == CollisionHook.INSTALLING && target.getBundleId() == 0) {
+			// Make a copy of the collisions only for calling the hooks;
+			// Any removals from hooks are ignored in this case
+			//	collisionCandidates = new ArrayList<Bundle>(collisionCandidates);
+			//}
 			final Collection<Bundle> shrinkable = new ShrinkableCollection<Bundle>(collisionCandidates);
 			if (System.getSecurityManager() == null) {
 				notifyCollisionHooksPriviledged(operationType, target, shrinkable);