1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java
index 2e7bcb590c..8c1f939e18 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java
@@ -57,14 +57,16 @@ public final class Activator extends EMFPlugin
     public void start(BundleContext context) throws Exception
     {
       super.start(context);
-      OSGiActivator.startBundle(context, OM.BUNDLE);
+      // DO NOT MERGE THAT
+      // OSGiActivator.start(context);
     }
 
     @Override
     public void stop(BundleContext context) throws Exception
     {
       plugin = null;
-      OSGiActivator.stopBundle(context, OM.BUNDLE);
+      // DO NOT MERGE THAT
+      // OSGiActivator.stopBundle(context, OM.BUNDLE);
       super.stop(context);
     }
   }