Attachment 207048 Details for Bug 345298 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

bp-mgr-deadlock-.patch (text/plain), 3.59 KB, created by Michael Rennie

on 2011-11-15 14:40:28 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Rennie

Created: 2011-11-15 14:40:28 EST

Size: 3.59 KB

patch

obsolete

>diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
>index e1f2e64..792126d 100644
>--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
>+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
>@@ -677,7 +677,9 @@
> 		manager.registerAdapters(actionFactory, ITerminate.class);
> 		manager.registerAdapters(actionFactory, ILaunch.class);
> 		manager.registerAdapters(actionFactory, IProcess.class);
>-		manager.registerAdapters(actionFactory, IDebugElement.class);		
>+		manager.registerAdapters(actionFactory, IDebugElement.class);	
>+		getBreakpointManager();
>+		fBreakpointManager.start();
> 	}
> 
> 	/**
>diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java
>index 6ea9afa..16bd205 100644
>--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java
>+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2005 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -28,12 +28,11 @@
> import org.eclipse.debug.core.DebugException;
> import org.eclipse.debug.core.DebugPlugin;
> import org.eclipse.debug.core.IBreakpointManager;
>-import org.eclipse.debug.internal.core.BreakpointManager;
> import org.eclipse.debug.internal.core.DebugCoreMessages;
> 
> /**
>  * Abstract implementation of a breakpoint. This class is
>- * intended to be subclassed by implementations
>+ * intended to be sub-classed by implementations
>  * of breakpoints.
>  * 
>  * @see IBreakpoint
>@@ -46,16 +45,6 @@
> 	 * Underlying marker.
> 	 */
> 	private IMarker fMarker= null;
>-
>-    /**
>-     * Default constructor used to ensure that breakpoint manager is initialized.
>-     */
>-    public Breakpoint() {
>-        // making sure that the BreakpointManager is correctly initialized
>-        // before any breakpoint marker related operation (see bug 54993)
>-        ((BreakpointManager)DebugPlugin.getDefault().getBreakpointManager()).ensureBreakpointsInitialized();
>-    }
>-                
> 
> 	/**
> 	 * @see IBreakpoint#setMarker(IMarker)
>diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
>index cb666a0..32552d3 100644
>--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
>+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
>@@ -341,6 +341,13 @@
>         	fImportParticipants = null;
>         	fDefaultParticipant = null;
>         }
>+        if(fBreakpoints != null) {
>+        	fBreakpoints.clear();
>+        	fBreakpoints = null;
>+        }
>+        if(fMarkersToBreakpoints != null) {
>+        	fMarkersToBreakpoints.clear();
>+        }
> 	}
> 
> 	/**
>@@ -394,10 +401,14 @@
> 	}
> 	
> 	/**
>-	 * Calls {@link #initializeBreakpoints()} if breakpoints have not yet been initialized.
>+	 * Perform any initialization of the manager. 
>+	 * 
>+	 * Called when {@link DebugPlugin#start(org.osgi.framework.BundleContext)} is called.
>+	 * 
>+	 * @since 3.8
> 	 */
>-	public void ensureBreakpointsInitialized() {
>-	    getBreakpoints0();
>+	public void start() {
>+		getBreakpoints0();
> 	}
> 	
> 	/**

Actions: View | Diff

Attachments on bug 345298: 195241 | 195244 | 195245 | 195260 | 195261 | 205458 | 206104 | 207048 | 207052