diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 87ba2e8974c..9cfdb16da7d 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-09 Mikhail Khodjaiants
+	Final fix for PR 39484: Move 'getType' method from ICDIVariable to ICDIVaraibleObject.
+	* CArrayPartition.java
+	* CVariable.java
+ 
 2003-09-09 Mikhail Khodjaiants
 	Regrouping the launch configuration constants.
 	* ICDTLaunchConfigurationConstants.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CArrayPartition.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CArrayPartition.java
index d18fcb631ac..041d237af60 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CArrayPartition.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CArrayPartition.java
@@ -170,8 +170,9 @@ public class CArrayPartition extends CVariable
 		{
 			try
 			{
-				if ( fCDIVariable != null && !(fCDIVariable instanceof ErrorVariable) )
-					fType = new CType( fCDIVariable.getType() );
+				ICDIVariableObject varObject = getVariableObject();
+				if ( varObject != null )
+					fType = new CType( varObject.getType() );
 			}
 			catch (CDIException e)
 			{
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 23b2195ab41..86e63b89b5a 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
@@ -212,9 +212,9 @@ public abstract class CVariable extends CDebugElement
 		{
 			if ( fType == null )
 			{
-				ICDIVariable var = getCDIVariable();
-				if ( var != null && !(var instanceof ErrorVariable) )
-					fType = new CType( var.getType() );
+				ICDIVariableObject varObject = getCDIVariableObject();
+				if ( varObject != null )
+					fType = new CType( varObject.getType() );
 			}
 			return fType;
 		}