diff options
| author | Thomas Watson | 2006-04-18 13:48:01 +0000 |
|---|---|---|
| committer | Thomas Watson | 2006-04-18 13:48:01 +0000 |
| commit | f5c2921d36e23885e79029c349df8fe9e16c866f (patch) | |
| tree | 25987f74475fe349ce9001583718ddb58964461a | |
| parent | 93cca54c27ef740007e9650cf13d1bfe8cd934cf (diff) | |
| download | rt.equinox.framework-f5c2921d36e23885e79029c349df8fe9e16c866f.tar.gz rt.equinox.framework-f5c2921d36e23885e79029c349df8fe9e16c866f.tar.xz rt.equinox.framework-f5c2921d36e23885e79029c349df8fe9e16c866f.zip | |
Bug 129058 [DS] halts the shutdown process if a component is registered
| -rw-r--r-- | bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ServiceRegistrationImpl.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ServiceRegistrationImpl.java b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ServiceRegistrationImpl.java index d6afddc64..cc9a23e95 100644 --- a/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ServiceRegistrationImpl.java +++ b/bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/ServiceRegistrationImpl.java @@ -427,8 +427,10 @@ public class ServiceRegistrationImpl implements ServiceRegistration { if (use != null) { use.releaseService(); - - contextsUsing.remove(user); + // contextsUsing may have been nulled out by use.releaseService() if the registrant bundle + // is listening for events and unregisters the service + if (contextsUsing != null) + contextsUsing.remove(user); } } } |