From d36e8f3b7c7bf6537a5c01d919c942e981af8773 Mon Sep 17 00:00:00 2001
From: Pawel Piech <pawel.piech@windriver.com>
Date: Wed, 30 Apr 2008 19:14:19 +0000
Subject: [PATCH] [206561] Added call to RequestMonitor.cancel() when the view
 model is found to be canceled, to avoid an assertion error in RequestMonitor.

---
 .../org/eclipse/dd/dsf/ui/viewmodel/VMViewerUpdate.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMViewerUpdate.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMViewerUpdate.java
index a2c294d9086..0eccd5a4b72 100644
--- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMViewerUpdate.java
+++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/VMViewerUpdate.java
@@ -150,11 +150,7 @@ public class VMViewerUpdate implements IViewerUpdate {
     public TreePath getElementPath() { return fElementPath; }
     public IPresentationContext getPresentationContext() { return fPresentationContext; }
     public IStatus getStatus() { return fRequestMonitor.getStatus(); }
-    public void setStatus(IStatus status) {
-        if ( isCanceled() ) {
-            fRequestMonitor.cancel();
-        }
-    	fRequestMonitor.setStatus(status); }
+    public void setStatus(IStatus status) { fRequestMonitor.setStatus(status); }
     
     public boolean isCanceled() { 
         if (fClientUpdate != null) {
@@ -174,6 +170,7 @@ public class VMViewerUpdate implements IViewerUpdate {
     public void done() { 
         try {
             if ( isCanceled() ) {
+                fRequestMonitor.cancel();
                 fRequestMonitor.setStatus(new Status( IStatus.CANCEL, DsfUIPlugin.PLUGIN_ID," Update was cancelled") ); //$NON-NLS-1$
             }
             fRequestMonitor.done();