From c2d6547a5dab0479b47c030c6dd7728e08f77aa1 Mon Sep 17 00:00:00 2001
From: Ken Ryall <ken.ryall@nokia.com>
Date: Tue, 13 Feb 2007 20:38:56 +0000
Subject: [PATCH] Fix a case where breakpoint problem markers were not removed
 at the end of a debug session. Bug 172722.

---
 .../debug/internal/core/CBreakpointManager.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 88a87b12c29..6d8c6ea6ef2 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
@@ -586,6 +586,13 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
 	}
 
 	private void removeAllBreakpoints() {
+		// Remove all breakpoint problem markers
+		for (Iterator iter = fBreakpointProblems.iterator(); iter.hasNext();) {
+			IMarker marker = (IMarker) iter.next();
+			try {
+				marker.delete();
+			} catch (CoreException e) {}
+		}
 		ArrayList list = new ArrayList();
 		ICBreakpoint[] breakpoints = new ICBreakpoint[0];
 		synchronized( getBreakpointMap() ) {
@@ -609,13 +616,6 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
 			}
 		} );			
 		getBreakpointNotifier().breakpointsRemoved( getDebugTarget(), breakpoints );
-		// Remove all breakpoint problem markers
-		for (Iterator iter = fBreakpointProblems.iterator(); iter.hasNext();) {
-			IMarker marker = (IMarker) iter.next();
-			try {
-				marker.delete();
-			} catch (CoreException e) {}
-		}
 	}
 
 	private ICBreakpoint[] register( IBreakpoint[] breakpoints ) {