From f3284051209db934762629dfee35e90c8a460d69 Mon Sep 17 00:00:00 2001
From: Randy Rohrbach <Randy.Rohrbach@Windriver.com>
Date: Fri, 7 Mar 2008 19:46:13 +0000
Subject: [PATCH] Bugzilla's 221898 & 219127.

---
 .../dd/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java      | 2 +-
 .../debug/ui/viewmodel/register/RegisterBitFieldVMNode.java   | 4 ++++
 .../dsf/debug/ui/viewmodel/register/RegisterGroupVMNode.java  | 1 +
 .../dd/dsf/debug/ui/viewmodel/register/RegisterVMNode.java    | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java
index 40bafae38c3..84d84de0a4a 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/modules/ModulesVMNode.java
@@ -43,7 +43,7 @@ public class ModulesVMNode extends AbstractDMVMNode
     
     @Override
     protected void updateElementsInSessionThread(final IChildrenUpdate update) {
-        if (!checkService(IRegisters.class, null, update)) return;
+        if (!checkService(IModules.class, null, update)) return;
         
         final ISymbolDMContext symDmc = findDmcInPath(update.getViewerInput(), update.getElementPath(), ISymbolDMContext.class) ;
         
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java
index 3d29b733e04..bf368b39e59 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldVMNode.java
@@ -273,6 +273,8 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
     protected void updateLabelInSessionThread(ILabelUpdate[] updates) {
         for (final ILabelUpdate update : updates) {
             
+            if (!checkService(IRegisters.class, null, update)) continue;
+            
             final IBitFieldDMContext dmc = findDmcInPath(update.getViewerInput(), update.getElementPath(), IRegisters.IBitFieldDMContext.class);
             
             getDMVMProvider().getModelData(
@@ -367,6 +369,8 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode
             return;
         }          
         
+        if (!checkService(IRegisters.class, null, update)) return;
+        
         getServicesTracker().getService(IRegisters.class).getBitFields(
             regDmc,
             new DataRequestMonitor<IBitFieldDMContext[]>(getSession().getExecutor(), null) {
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupVMNode.java
index ca83235aacb..835a6e7731e 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupVMNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterGroupVMNode.java
@@ -132,6 +132,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode
 
     @Override
     protected void updateElementsInSessionThread(final IChildrenUpdate update) {
+        if (!checkService(IRegisters.class, null, update)) return;
         getServicesTracker().getService(IRegisters.class).getRegisterGroups(
             createCompositeDMVMContext(update),
             new DataRequestMonitor<IRegisterGroupDMContext[]>(getSession().getExecutor(), null) { 
diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterVMNode.java
index 71ce6399069..1a35a3efe39 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterVMNode.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterVMNode.java
@@ -161,6 +161,8 @@ public class RegisterVMNode extends AbstractExpressionVMNode
      */
     private void updateFormattedRegisterValue(final ILabelUpdate update, final int labelIndex, final IRegisterDMContext dmc)
     {
+        if (!checkService(IRegisters.class, null, update)) return;
+        
         final IRegisters regService = getServicesTracker().getService(IRegisters.class);
         /*
          *  First select the format to be used. This involves checking so see that the preference
@@ -362,6 +364,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode
 
     @Override
     protected void updateElementsInSessionThread(final IChildrenUpdate update) {
+        if (!checkService(IRegisters.class, null, update)) return;
         getServicesTracker().getService(IRegisters.class).getRegisters(
             createCompositeDMVMContext(update),
             new DataRequestMonitor<IRegisterDMContext[]>(getSession().getExecutor(), null) {