From a729a32e6164025222109f0f5d3760112f9054da Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Mon, 27 Jun 2005 15:22:16 +0000
Subject: [PATCH] 2005-05-27 Alain Magloire 	Use the fCDIVariable instead
 of fCDIVariableObject when possible. 	*
 src/org/eclipse/cdt/debug/internal/core/model/CVariable.java

---
 debug/org.eclipse.cdt.debug.core/ChangeLog                    | 4 ++++
 .../org/eclipse/cdt/debug/internal/core/model/CVariable.java  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index da8c7efe177..2b9acd110ac 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-27 Alain Magloire
+	Use the fCDIVariable instead of fCDIVariableObject when possible.
+	* src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
+
 2005-05-23 Mikhail Khodjaiants
 	Bug 100756: Breakpoints listed twice in Breakpoints view.
 	* CBreakpointManager.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
index 4f414651cdd..74be331cc2f 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CVariable.java
@@ -129,6 +129,9 @@ public class CVariable extends AbstractCVariable implements ICDIEventListener {
 		}
 
 		private ICDIVariableDescriptor getCDIVariableObject() {
+			if (fCDIVariable != null) {
+				return fCDIVariable;
+			}
 			return fCDIVariableObject;
 		}