Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2015-01-26 19:42:06 +0000
committerThomas Watson2015-01-26 19:42:06 +0000
commit656154bbb548e7e6f9fcc7f2c047490062ce32ec (patch)
treef8f39c8cff21b5e14db167c20d9da48fe3e37634 /bundles/org.eclipse.equinox.cm/src
parent445f933e18bf500789c2707a3123c0a3bce35a7c (diff)
downloadrt.equinox.bundles-656154bbb548e7e6f9fcc7f2c047490062ce32ec.tar.gz
rt.equinox.bundles-656154bbb548e7e6f9fcc7f2c047490062ce32ec.tar.xz
rt.equinox.bundles-656154bbb548e7e6f9fcc7f2c047490062ce32ec.zip
Bug 458427 - [cm] Equinox ConfigAdmin requires OSGi R6, does not run inI20150128-2000I20150128-0900I20150127-2000I20150127-0900I20150126-2000
Concierge
Diffstat (limited to 'bundles/org.eclipse.equinox.cm/src')
-rw-r--r--bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/Activator.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/Activator.java b/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/Activator.java
index 0edeaab5..19763782 100644
--- a/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/Activator.java
+++ b/bundles/org.eclipse.equinox.cm/src/org/eclipse/equinox/internal/cm/Activator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2013 Cognos Incorporated, IBM Corporation
+ * Copyright (c) 2006, 2014 Cognos Incorporated, IBM Corporation
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,7 +23,7 @@ import org.osgi.service.cm.ConfigurationAdmin;
public class Activator implements BundleActivator {
private static final String EVENT_ADMIN_CLASS = "org.osgi.service.event.EventAdmin"; //$NON-NLS-1$
private LogTracker logTracker;
- private ServiceRegistration<ConfigurationAdmin> registration;
+ private ServiceRegistration<?> registration;
private ConfigurationAdminFactory factory;
private ConfigurationEventAdapter eventAdapter;
private static BundleContext bundleContext;
@@ -50,7 +50,7 @@ public class Activator implements BundleActivator {
factory = new ConfigurationAdminFactory(context, logTracker);
factory.start();
context.addBundleListener(factory);
- registration = context.registerService(ConfigurationAdmin.class, factory, null);
+ registration = context.registerService(ConfigurationAdmin.class.getName(), factory, null);
}
public void stop(BundleContext context) throws Exception {

Back to the top