From eaef0e09b7861bd9fba5fa3f15d403c58f28d6c6 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 4 Sep 2012 21:44:57 +0000 Subject: [PATCH] [385793] [dstore] DataStore spirit mechanism and other memory improvements needed -updated to clear _attributes so element seen as deleted --- .../src/org/eclipse/dstore/core/model/DataElement.java | 2 +- .../src/org/eclipse/dstore/core/model/UpdateHandler.java | 2 +- 2 files changed, 2 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 414be7263b4..ffae602b619 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 @@ -1630,7 +1630,7 @@ public final class DataElement implements IDataElement { _attributes[i] = null; } - + _attributes = null; } if (_nestedData != null) diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java index 0262e54cda7..64e02e380b8 100644 --- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java +++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/model/UpdateHandler.java @@ -97,7 +97,7 @@ public abstract class UpdateHandler extends Handler child.delete(); } } - if (!virtual || !child.isSpirit()){ // leave the client attributes if spirited + if (!virtual){ // leave the client attributes if spirited child.clear(); } if (parent != null)