diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 09e54a28410..b316f327cb2 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-27 Mikhail Khodjaiants
+	Use 'equals' to compare CDI variables instead of names.
+	* CStackFrame.java
+
 2003-01-27 Alain Magloire
 
 	* src/org/eclipse/cdt/debug/core/cdi/model/ICDIVariableObject.java:
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java
index 0859c81f417..aa11151a545 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CStackFrame.java
@@ -130,11 +130,6 @@ public class CStackFrame extends CDebugElement
 			ICDIVariable var = findVariable( locals, local.getCDIVariable() );
 			if ( var != null )
 			{
-				// update variable with new underling CDI LocalVariable
-				if ( !var.equals( local.getCDIVariable() ) )
-				{
-					local.setCDIVariable( var );
-				}
 				locals.remove( var );
 				index++;
 			}
@@ -718,21 +713,14 @@ public class CStackFrame extends CDebugElement
 		}
 	}
 	
-	// temporary solution
 	protected ICDIVariable findVariable( List list, ICDIVariable var )
 	{
 		Iterator it = list.iterator();
 		while( it.hasNext() )
 		{
 			ICDIVariable newVar = (ICDIVariable)it.next();
-			try
-			{
-				if ( newVar.getName().equals( var.getName() ) )
-					return newVar;
-			}
-			catch( CDIException e )
-			{
-			}
+			if ( newVar.equals( var ) )
+				return newVar;
 		}
 		return null;
 	}