aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStoyan Boshev2011-11-16 13:12:19 (EST)
committerStoyan Boshev2011-11-16 13:12:19 (EST)
commitd6c420ff35e4ae5abb9971d9cc9db6a1535c546c (patch)
tree92ec49776c3634b42b1a1481ed3ca83402041e7d
parentb10ce329e05fabc0348417bb7979200249f2ccb1 (diff)
downloadrt.equinox.bundles-d6c420ff35e4ae5abb9971d9cc9db6a1535c546c.zip
rt.equinox.bundles-d6c420ff35e4ae5abb9971d9cc9db6a1535c546c.tar.gz
rt.equinox.bundles-d6c420ff35e4ae5abb9971d9cc9db6a1535c546c.tar.bz2
Bug 344538 [ds] NullPointerException inv20111116-1812
ComponentInstanceImpl.freeServiceReferences
-rw-r--r--bundles/org.eclipse.equinox.ds/src/org/eclipse/equinox/internal/ds/impl/ComponentInstanceImpl.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class ComponentInstanceImpl implements ComponentInstance {
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 @@ public class ComponentInstanceImpl implements ComponentInstance {
// free service references if some are left ungotten
freeServiceReferences();
+ scp = null;
componentContext = null;
instance = null;
}