1 files changed, 8 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 234a5a7ab2..00622ca287 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
@@ -69,7 +69,7 @@ public final class Activator extends EMFPlugin
       try
       {
         super.start(context);
-        OM.BUNDLE.setBundleContext(context);
+        setBundleContext(context);
         doStart();
       }
       catch (Error error)
@@ -97,7 +97,7 @@ public final class Activator extends EMFPlugin
       try
       {
         doStop();
-        OM.BUNDLE.setBundleContext(null);
+        setBundleContext(null);
         super.stop(context);
       }
       catch (Error error)
@@ -127,5 +127,11 @@ public final class Activator extends EMFPlugin
     {
       LifecycleUtil.deactivate(CDOViewProviderRegistryImpl.INSTANCE, OMLogger.Level.WARN);
     }
+
+    @SuppressWarnings("deprecation")
+    private void setBundleContext(BundleContext context)
+    {
+      OM.BUNDLE.setBundleContext(context);
+    }
   }
 }