From 0e5e6f7e90ecd0c2780258cf42940bb781099286 Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Fri, 17 Nov 2006 18:06:57 +0000
Subject: [PATCH] [161342] fix for null pointer exception in strange timing
 scenario

---
 .../rse/connectorservice/dstore/DStoreConnectorService.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
index 5ed7a2f085a..428df1fe8aa 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
@@ -317,8 +317,10 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 				{
 					dataStore.getDomainNotifier().removeDomainListener(_connectionStatusListener);
 				}
-
-				clientConnection.disconnect();
+				if (clientConnection != null)
+				{
+					clientConnection.disconnect();
+				}
 				
 //				 Fire comm event to signal state changed
 				notifyDisconnection();