diff --git a/rse/examples/org.eclipse.rse.examples.dstore/src/org/eclipse/rse/examples/dstore/subsystems/SampleSubSystem.java b/rse/examples/org.eclipse.rse.examples.dstore/src/org/eclipse/rse/examples/dstore/subsystems/SampleSubSystem.java index 56edcfed1a6..96ef6cb32a8 100644 --- a/rse/examples/org.eclipse.rse.examples.dstore/src/org/eclipse/rse/examples/dstore/subsystems/SampleSubSystem.java +++ b/rse/examples/org.eclipse.rse.examples.dstore/src/org/eclipse/rse/examples/dstore/subsystems/SampleSubSystem.java @@ -112,11 +112,13 @@ public class SampleSubSystem extends SubSystem { @Override public void uninitializeSubSystem(IProgressMonitor monitor) { - _root.setHostSampleObject(null); - _root.setContents(null); - super.uninitializeSubSystem(monitor); + if (_root != null){ + _root.setHostSampleObject(null); + _root.setContents(null); + } getSampleService().uninitService(monitor); + super.uninitializeSubSystem(monitor); }