| commit | d6c420ff35e4ae5abb9971d9cc9db6a1535c546c | [log] [tgz] |
|---|---|---|
| author | Stoyan Boshev <s.boshev@prosyst.com> | Wed Nov 16 20:12:19 2011 +0200 |
| committer | Stoyan Boshev <s.boshev@prosyst.com> | Wed Nov 16 20:12:19 2011 +0200 |
| tree | 92ec49776c3634b42b1a1481ed3ca83402041e7d | |
| parent | b10ce329e05fabc0348417bb7979200249f2ccb1 [diff] |
Bug 344538 [ds] NullPointerException in ComponentInstanceImpl.freeServiceReferences
diff --git a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/impl/ComponentInstanceImpl.java b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/impl/ComponentInstanceImpl.java index 74477e0..fbd3b02 100644 --- a/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/impl/ComponentInstanceImpl.java +++ b/bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/impl/ComponentInstanceImpl.java
@@ -62,7 +62,6 @@ InstanceProcess.resolver.disposeComponentConfigs(toDispose, ComponentConstants.DEACTIVATION_REASON_DISPOSED); if (scp != null) { scp.setState(Component.STATE_DISPOSED); - scp = null; } } else { scp.dispose(this, ComponentConstants.DEACTIVATION_REASON_DISPOSED); @@ -70,6 +69,7 @@ // free service references if some are left ungotten freeServiceReferences(); + scp = null; componentContext = null; instance = null; }