From c37481f65de812f14761870c6b0a30fc176f81a3 Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Mon, 24 Aug 2009 16:51:07 +0000
Subject: [PATCH] [287457] [dstore] problems with disconnect when readonly
 trace file

---
 .../org/eclipse/dstore/core/model/DataStore.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
index 368d3754280..b12837d4425 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataStore.java
@@ -30,6 +30,7 @@
  * David McKnight   (IBM) - [282599] [dstore] log folder that is not a hidden one
  * David McKnight   (IBM) - [285151] [dstore] Potential threading problem in DataStore (open call)
  * David McKnight   (IBM) - [285301] [dstore] 100% CPU if user does not  have write access to $HOME
+ * David McKnight   (IBM) - [287457] [dstore] problems with disconnect when readonly trace file
  *******************************************************************************/
 
 package org.eclipse.dstore.core.model;
@@ -3956,7 +3957,7 @@ public final class DataStore
 				_hashMap.remove(id);
 			}
 
-			if (!isConnected())
+			if (!isConnected() && from != null)
 			{
 				from.removeNestedData(toDelete);
 			}
@@ -4138,16 +4139,19 @@ public final class DataStore
 		// which causes havoc for iSeries caching when switching between offline / online
 		//if (isVirtual())
 		//	flush();
-		if (_deRemover != null)
+		if (_deRemover != null){
 			_deRemover.finish();
+		}
 
 		if (_tracingOn)
 		{
 			try
 			{
-				_traceFile.writeBytes("Finished Tracing"); //$NON-NLS-1$
-				_traceFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$
-				_traceFile.close();
+				if (_traceFile != null){
+					_traceFile.writeBytes("Finished Tracing"); //$NON-NLS-1$
+					_traceFile.writeBytes(System.getProperty("line.separator")); //$NON-NLS-1$
+					_traceFile.close();
+				}
 			}
 			catch (IOException e)
 			{