diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index d773f960d8b..d19f8e7a207 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-17 Mikhail Khodjaiants
+	The 'getLineNumber' method of CStackFrame should return the line number associated with the stack frame if the current source locator 
+	does not implement 'ICSourceLocator'.
+	* CStackFrame.java
+
 2002-12-17 Mikhail Khodjaiants
 	Changed the implementation of the 'refresh' method of CVariable.
 	* CVariable.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 28e7a50c9fb..38333c2c2ef 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
@@ -180,6 +180,8 @@ public class CStackFrame extends CDebugElement
 			ISourceLocator locator = ((CDebugTarget)getDebugTarget()).getSourceLocator();
 			if ( locator != null && locator instanceof ICSourceLocator )
 				return ((ICSourceLocator)locator).getLineNumber( this );
+			if ( getCDIStackFrame() != null && getCDIStackFrame().getLocation() != null )
+				return getCDIStackFrame().getLocation().getLineNumber();
 		}
 		return -1;
 	}