diff options
3 files changed, 8 insertions, 5 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF index f1400f7fc..585d4e7a3 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundle.name Bundle-SymbolicName: org.eclipse.ecf.osgi.services.remoteserviceadmin Automatic-Module-Name: org.eclipse.ecf.osgi.services.remoteserviceadmin -Bundle-Version: 4.6.400.qualifier +Bundle-Version: 4.6.500.qualifier Bundle-Activator: org.eclipse.ecf.internal.osgi.services.remoteserviceadmin.Activator Bundle-Vendor: %bundle.provider Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/pom.xml b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/pom.xml index 79b7b2c47..dea1f0d16 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/pom.xml +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/pom.xml @@ -10,6 +10,6 @@ </parent> <groupId>org.eclipse.ecf</groupId> <artifactId>org.eclipse.ecf.osgi.services.remoteserviceadmin</artifactId> - <version>4.6.400-SNAPSHOT</version> + <version>4.6.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> 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 3ce902f0f..b005c6b11 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 @@ -253,8 +253,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(); - // initialize sax parser factory if necessary - initializeSAXParserFactory(); // Start distribution providers if not already started initializeProviders(context.getBundle(), DistributionNamespace.DISTRIBUTION_NAMESPACE, "Could not start distribution provider. "); //$NON-NLS-1$ @@ -431,7 +429,12 @@ public class Activator implements BundleActivator { saxParserFactoryTracker = new ServiceTracker(context, SAXParserFactory.class.getName(), null); saxParserFactoryTracker.open(); } - return (SAXParserFactory) saxParserFactoryTracker.getService(); + SAXParserFactory result = (SAXParserFactory) saxParserFactoryTracker.getService(); + if (result == null) { + result = SAXParserFactory.newInstance(); + context.registerService(SAXParserFactory.class.getName(), result, null); + } + return result; } } |