Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/osgi
diff options
context:
space:
mode:
authorslewis2018-05-07 14:38:14 -0400
committerslewis2018-05-07 14:38:14 -0400
commit9a681531f419ffb549870431a52c3b467fe3d032 (patch)
tree5f4bd653705fc8b970768d5d155611cd62c8e6e1 /osgi
parentc655906a17423e12a7ee6229938472a7ab96077f (diff)
downloadorg.eclipse.ecf-9a681531f419ffb549870431a52c3b467fe3d032.tar.gz
org.eclipse.ecf-9a681531f419ffb549870431a52c3b467fe3d032.tar.xz
org.eclipse.ecf-9a681531f419ffb549870431a52c3b467fe3d032.zip
Revised fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=534439
Diffstat (limited to 'osgi')
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java19
1 files changed, 8 insertions, 11 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
index b005c6b11..a91bbf014 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/internal/osgi/services/remoteserviceadmin/Activator.java
@@ -228,11 +228,6 @@ public class Activator implements BundleActivator {
}
}
- private void initializeSAXParserFactory() {
- ServiceReference<?> ref = Activator.context.getServiceReference(SAXParserFactory.class.getName());
- if (ref == null)
- Activator.context.registerService(SAXParserFactory.class.getName(), SAXParserFactory.newInstance(), null);
- }
/*
* (non-Javadoc)
*
@@ -253,12 +248,6 @@ public class Activator implements BundleActivator {
// approach/using the ServiceFactory extender approach for this purpose:
// https://mail.osgi.org/pipermail/osgi-dev/2011-February/003000.html
initializeProxyServiceFactoryBundle();
- // Start distribution providers if not already started
- initializeProviders(context.getBundle(), DistributionNamespace.DISTRIBUTION_NAMESPACE,
- "Could not start distribution provider. "); //$NON-NLS-1$
- // Start distribution providers if not already started
- initializeProviders(context.getBundle(), DiscoveryNamespace.DISCOVERY_NAMESPACE,
- "Could not start discovery provider. "); //$NON-NLS-1$
// make remote service admin available
rsaProps = new Properties();
rsaProps.put(RemoteServiceAdmin.SERVICE_PROP, new Boolean(true));
@@ -323,6 +312,9 @@ public class Activator implements BundleActivator {
});
ctdTracker.open();
+ // Start distribution providers if not already started
+ initializeProviders(context.getBundle(), DistributionNamespace.DISTRIBUTION_NAMESPACE,
+ "Could not start distribution provider. "); //$NON-NLS-1$
// create endpoint description locator
endpointDescriptionLocator = new EndpointDescriptionLocator(context);
// create and register endpoint description advertiser
@@ -333,6 +325,11 @@ public class Activator implements BundleActivator {
// start endpointDescriptionLocator
endpointDescriptionLocator.start();
+
+ // Start discovery providers if not already started
+ initializeProviders(context.getBundle(), DiscoveryNamespace.DISCOVERY_NAMESPACE,
+ "Could not start discovery provider. "); //$NON-NLS-1$
+
}
/*

Back to the top