diff options
| author | slewis | 2018-05-18 01:49:42 +0000 |
|---|---|---|
| committer | slewis | 2018-05-18 01:49:42 +0000 |
| commit | 470ca52e33bccf4c1d6a0f745fbc8eb0be4eff97 (patch) | |
| tree | 0d4142eba3aa558d19abafb2d447852ab91ff9d0 | |
| parent | 4e0732bceb44999cc0ca63a90a044dc88795905f (diff) | |
| download | org.eclipse.ecf-470ca52e33bccf4c1d6a0f745fbc8eb0be4eff97.tar.gz org.eclipse.ecf-470ca52e33bccf4c1d6a0f745fbc8eb0be4eff97.tar.xz org.eclipse.ecf-470ca52e33bccf4c1d6a0f745fbc8eb0be4eff97.zip | |
Third final fix for bndtools-imposed start structure
Change-Id: I0000000000000000000000000000000000000000
3 files changed, 9 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 94f26adf2..7b6df004c 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.700.qualifier +Bundle-Version: 4.6.800.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 8a39760af..c84ece789 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.700-SNAPSHOT</version> + <version>4.6.800-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 5ff284d94..c0d515044 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,8 +148,13 @@ 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)) - return bundle; + if (bundle.getSymbolicName().equals(Activator.PLUGIN_ID)) { + if (bundle.getState() == Bundle.ACTIVE) { + latch.countDown(); + return null; + } + else return bundle; + } return null; } public void modifiedBundle(Bundle bundle, BundleEvent event, Object object) { |