diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 132c36befc0..75d053baaf6 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,6 @@ +2003-10-14 Mikhail Khodjaiants + * DebugTextHover.java: check if the result of 'evaluateExpression' is not null before trim it. + 2003-10-06 Mikhail Khodjaiants Mark the function arguments in the Variables View. * icons\full\ovr16\argument_ovr.gif: new diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHover.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHover.java index db350f7db30..87ea488f416 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHover.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/editors/DebugTextHover.java @@ -90,11 +90,11 @@ public class DebugTextHover implements ITextHover ICExpressionEvaluator ee = (ICExpressionEvaluator)target.getAdapter( ICExpressionEvaluator.class ); if ( ee.canEvaluate() ) { - String result = evaluateExpression( ee, expression ).trim(); + String result = evaluateExpression( ee, expression ); try { if ( result != null ) - appendVariable( buffer, expression, result, showDebugTarget ? target.getName() : null ); + appendVariable( buffer, expression, result.trim(), showDebugTarget ? target.getName() : null ); } catch( DebugException x ) {