Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Khodjaiants2003-12-23 13:03:14 -0500
committerMikhail Khodjaiants2003-12-23 13:03:14 -0500
commitc064b574687768019a591c54ff43df53fc7d06e9 (patch)
tree0cd6d17b9b85c8f8611317ae74af261f1e12a45e
parent8a776c89791bcfdff6d0d2f9c9621bdf357fa92d (diff)
downloadorg.eclipse.cdt-c064b574687768019a591c54ff43df53fc7d06e9.tar.gz
org.eclipse.cdt-c064b574687768019a591c54ff43df53fc7d06e9.tar.xz
org.eclipse.cdt-c064b574687768019a591c54ff43df53fc7d06e9.zip
Fix for bug 49294: Source file doesn't change when switching between stack frames.
-rw-r--r--debug/org.eclipse.cdt.debug.core/ChangeLog5
-rw-r--r--debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java9
2 files changed, 6 insertions, 8 deletions
diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 768c7e7e7ed..f49365506ac 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-23 Mikhail Khodjaiants
+ Fix for bug 49294: Source file doesn't change when switching between stack frames.
+ Do not use the breakpoint's markers for source lookup.
+ * CSourceManager.java
+
2003-12-08 Mikhail Khodjaiants
Reset the 'terminating' flag if 'terminate' fails.
* CDebugTarget.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java
index c8e2ca56da0..488320e9d49 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java
@@ -157,14 +157,7 @@ public class CSourceManager implements ICSourceLocator,
boolean autoDisassembly = CDebugCorePlugin.getDefault().getPluginPreferences().getBoolean( ICDebugConstants.PREF_AUTO_DISASSEMBLY );
if ( getMode() == ISourceMode.MODE_SOURCE && getSourceLocator() != null )
- {
- // if the target is suspended by a line breakpoint the source manager
- // tries to retrieve the file resource from the breakpoint marker.
- if ( getDebugTarget() != null )
- result = getDebugTarget().getCurrentBreakpointFile();
- if ( result == null )
- result = getSourceLocator().getSourceElement( stackFrame );
- }
+ result = getSourceLocator().getSourceElement( stackFrame );
if ( result == null &&
( autoDisassembly || getMode() == ISourceMode.MODE_DISASSEMBLY ) &&
getDisassemblyManager( stackFrame ) != null )

Back to the top