From 2017ba68386a8ffd5b86101ca4ad0147e8660364 Mon Sep 17 00:00:00 2001
From: David McKnight <dmcknigh@ca.ibm.com>
Date: Fri, 31 Aug 2007 14:41:30 +0000
Subject: [PATCH] merges from IBM RSE - memory cleaning

---
 .../src/org/eclipse/dstore/core/model/DataElement.java       | 2 +-
 .../src/org/eclipse/dstore/core/model/DataStore.java         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java
index a8539bc765c..8a76e071dc6 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/DataElement.java
@@ -1657,7 +1657,7 @@ public final class DataElement implements IDataElement
 			_isUpdated = false;
 			_isExpanded = true;
 			_buffer = null;
-			_nestedData = null;
+			//_nestedData = null;
 		}
 	}
 	
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 42979dcfad8..0df1cfbb9c5 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
@@ -1269,7 +1269,10 @@ public final class DataStore
 			parent.addNestedData(newObject, false);
 		}
 
-		_hashMap.put(id, newObject);
+		synchronized(_hashMap)
+		{
+			_hashMap.put(id, newObject);
+		}
 		
 		if (_autoRefresh)
 			refresh(parent);