From 8f61e02fd9592d9a3d593b4bfa1076418a535bea Mon Sep 17 00:00:00 2001
From: Ken Ryall <ken.ryall@nokia.com>
Date: Tue, 21 Aug 2007 01:42:02 +0000
Subject: [PATCH] Fix deadlock when clearing all breakpoints.

---
 .../cdt/debug/internal/core/CBreakpointManager.java       | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 54803418c55..872c1a9cd0f 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
@@ -444,9 +444,11 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
 		ICBreakpoint breakpoint = null;
 		synchronized( getBreakpointMap() ) {
 			breakpoint = getBreakpointMap().getCBreakpoint( cdiBreakpoint );
-			if ( breakpoint == null ) {
-				breakpoint = createLocationBreakpoint( cdiBreakpoint );
-			}
+		}
+		if ( breakpoint == null ) {
+			breakpoint = createLocationBreakpoint( cdiBreakpoint );
+		}
+		synchronized( getBreakpointMap() ) {
 			if ( breakpoint != null )
 				getBreakpointMap().put( breakpoint, cdiBreakpoint );
 		}