From d919839baee8bd3ce6d1934c5e907697d00fbc51 Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Tue, 24 Mar 2009 19:53:28 +0000
Subject: [PATCH] null pointer check in sample

---
 .../rse/examples/dstore/subsystems/SampleSubSystem.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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);
 	}