From 0f9429319ed8e41d8d445305311bc0effea631a8 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Mon, 13 Jan 2003 22:19:34 +0000 Subject: [PATCH] Iin the 'runUntil' method of CTarget check if file name or function name length > 0, otherwise use address. --- debug/org.eclipse.cdt.debug.mi.core/ChangeLog | 3 +++ .../src/org/eclipse/cdt/debug/mi/core/cdi/model/CTarget.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog index 669b290c5f3..3affcf791f5 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog @@ -1,3 +1,6 @@ +2003-01-13 Mikhail Khodjaiants + * CTarget.java: in the 'runUntil' method check if file name or function name length > 0, otherwise use address. + 2003-01-10 Alain Magloire * src/.../mi/core/cdi/BreakpointManager.java (update): fix subscript diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/CTarget.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/CTarget.java index 2d1293c3c1d..6e9a180d4c7 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/CTarget.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/CTarget.java @@ -486,9 +486,9 @@ public class CTarget implements ICDITarget { MISession mi = session.getMISession(); CommandFactory factory = mi.getCommandFactory(); String loc = ""; - if (location.getFile() != null) { + if (location.getFile() != null && location.getFile().length() > 0) { loc = location.getFile() + ":" + location.getLineNumber(); - } else if (location.getFunction() != null) { + } else if (location.getFunction() != null && location.getFunction().length() > 0) { loc = location.getFunction(); } else if (location.getAddress() != 0) { loc = "*" + location.getAddress();