From 4fb38140396b9a7f367c3463e1d6d12a183c8f41 Mon Sep 17 00:00:00 2001
From: Randy Rohrbach <Randy.Rohrbach@Windriver.com>
Date: Tue, 10 Jul 2007 02:48:20 +0000
Subject: [PATCH] Bugzilla 195920

---
 .../ui/viewmodel/register/RegisterLayoutNode.java     |  5 +++++
 .../eclipse/dd/dsf/ui/viewmodel/VMElementsUpdate.java | 11 ++++++++++-
 .../eclipse/dd/dsf/ui/viewmodel/update/VMCache.java   |  9 ++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java
index edeceaf6d0e..75e500242cd 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java
@@ -388,6 +388,11 @@ public class RegisterLayoutNode extends AbstractExpressionLayoutNode<IRegisterDM
             return IModelDelta.CONTENT;
         }
         else if (e instanceof IRegisters.IRegistersChangedDMEvent) {
+            /*
+             * Flush the cache.
+             */
+            VMCacheManager.getVMCacheManager().flush(super.getVMProvider().getPresentationContext());
+            
             return IModelDelta.CONTENT;
         }
         else if (e instanceof IRegisters.IRegisterChangedDMEvent) {
diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMElementsUpdate.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMElementsUpdate.java
index 4966402314e..23afa9d036f 100644
--- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMElementsUpdate.java
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMElementsUpdate.java
@@ -13,7 +13,11 @@ package org.eclipse.dd.dsf.ui.viewmodel;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.dd.dsf.concurrent.DataRequestMonitor;
+import org.eclipse.dd.dsf.service.IDsfService;
+import org.eclipse.dd.dsf.ui.DsfUIPlugin;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider;
 
@@ -71,7 +75,12 @@ public class VMElementsUpdate extends VMViewerUpdate implements IChildrenUpdate
     public void done() {
         @SuppressWarnings("unchecked")
         DataRequestMonitor<List<Object>> rm = (DataRequestMonitor<List<Object>>)fRequestMonitor;
-        rm.setData(fElements);
+        if (fElements.size() == fLength) {
+            rm.setData(fElements);
+        } else {
+            rm.setStatus(new Status(IStatus.ERROR, DsfUIPlugin.PLUGIN_ID, IDsfService.REQUEST_FAILED, "Incomplete elements of updates", null)); //$NON-NLS-1$
+        }
         super.done();
     }
+    
 }
diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/VMCache.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/VMCache.java
index 82ebfe9e33e..d6b7d60dc9e 100644
--- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/VMCache.java
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/update/VMCache.java
@@ -95,9 +95,12 @@ public abstract class VMCache
     			@Override
     			protected void handleCompleted()
     			{
-    				if(isCacheWriteEnabled())
-    					fHasChildren.put(update.getElement(), this.getData());
-    				update.setHasChilren(getData());
+                    if(getStatus().isOK())
+                    {
+                        if(isCacheWriteEnabled())
+                            fHasChildren.put(update.getElement(), this.getData());
+                        update.setHasChilren(getData());
+                    }
     				update.done();
     			}
 			});