From 5230c4fc5f9d9cd752c1989fca5fd46d5e0574eb Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Mon, 14 May 2012 17:42:55 +0000
Subject: [PATCH] -trivial np check

---
 .../files/dstore/RemoteFilePropertyChangeListener.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java
index db76b5de98f..3fdb60bd4a3 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/internal/subsystems/files/dstore/RemoteFilePropertyChangeListener.java
@@ -163,7 +163,9 @@ public class RemoteFilePropertyChangeListener implements IDomainListener,
 
     public void finish()
     {
-        dataStore.getDomainNotifier().removeDomainListener(this);
+    	if (dataStore != null){
+    		dataStore.getDomainNotifier().removeDomainListener(this);
+    	}
         _finished = true;
     }