diff options
Diffstat (limited to 'osgi')
3 files changed, 5 insertions, 4 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 376966982..8ebd3f00c 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.900.qualifier +Bundle-Version: 4.6.1000.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 459953be4..f40b57055 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.900-SNAPSHOT</version> + <version>4.6.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManagerImpl.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManagerImpl.java index c0d515044..36e3fc415 100644 --- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManagerImpl.java +++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/TopologyManagerImpl.java @@ -148,7 +148,8 @@ public class TopologyManagerImpl extends AbstractTopologyManager implements Endp BundleTracker bt = new BundleTracker<Bundle>(getContext(),Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.START_TRANSIENT | Bundle.ACTIVE , new BundleTrackerCustomizer() { public Bundle addingBundle(Bundle bundle, BundleEvent event) { - if (bundle.getSymbolicName().equals(Activator.PLUGIN_ID)) { + String bsn = bundle.getSymbolicName(); + if (bsn != null && bsn.equals(Activator.PLUGIN_ID)) { if (bundle.getState() == Bundle.ACTIVE) { latch.countDown(); return null; @@ -158,7 +159,7 @@ public class TopologyManagerImpl extends AbstractTopologyManager implements Endp return null; } public void modifiedBundle(Bundle bundle, BundleEvent event, Object object) { - if (event.getType() == BundleEvent.STARTED) + if (event != null && event.getType() == BundleEvent.STARTED) latch.countDown(); } public void removedBundle(Bundle bundle, BundleEvent event, Object object) {} |