From 81400bdcc24d57c1d71001df3b97d607535f8513 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 8 Sep 2004 21:38:02 +0000 Subject: [PATCH] Fix for bug 73498: Condition is cleared when disabled conditional breakpoint is set. --- debug/org.eclipse.cdt.debug.core/ChangeLog | 4 ++++ .../eclipse/cdt/debug/internal/core/CBreakpointManager.java | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index 790699cf008..8df7d58cb70 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,7 @@ +2004-09-07 Mikhail Khodjaiants + Fix for bug 73498: Condition is cleared when disabled conditional breakpoint is set. + * CBreakpointManager.java + 2004-09-07 Alain Magloire Remove ICDIBreakpointManager.java Remove ICDICatchEvent/ICDICatchpoint diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java index 1e71ccb9f38..c7730846801 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CBreakpointManager.java @@ -292,9 +292,10 @@ public class CBreakpointManager implements IBreakpointManagerListener, ICDIEvent if ( cdiBreakpoint == null ) return; breakpoint.setTargetFilter( getDebugTarget() ); - if ( !breakpoint.isEnabled() ) - cdiBreakpoint.setEnabled( false ); + boolean enabled = breakpoint.isEnabled(); setBreakpointCondition( breakpoint ); + if ( !enabled ) + cdiBreakpoint.setEnabled( false ); } catch( CoreException e ) { requestFailed( MessageFormat.format( InternalDebugCoreMessages.getString( "CBreakpointManager.0" ), new String[] { e.getMessage() } ), e ); //$NON-NLS-1$