Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 345298 | Differences between
and this patch

Collapse All | Expand All

(-)a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/Breakpoint.java (-7 / +12 lines)
Lines 28-33 Link Here
28
import org.eclipse.debug.core.DebugException;
28
import org.eclipse.debug.core.DebugException;
29
import org.eclipse.debug.core.DebugPlugin;
29
import org.eclipse.debug.core.DebugPlugin;
30
import org.eclipse.debug.core.IBreakpointManager;
30
import org.eclipse.debug.core.IBreakpointManager;
31
import org.eclipse.debug.internal.core.BreakpointManager;
31
import org.eclipse.debug.internal.core.DebugCoreMessages;
32
import org.eclipse.debug.internal.core.DebugCoreMessages;
32
33
33
/**
34
/**
Lines 41-57 Link Here
41
42
42
public abstract class Breakpoint extends PlatformObject implements IBreakpoint {
43
public abstract class Breakpoint extends PlatformObject implements IBreakpoint {
43
	
44
	
44
	static {
45
		// making sure that the BreakpointManager is correctly initialized
46
		// before any breakpoint marker related operation (see bug 54993)
47
		DebugPlugin.getDefault().getBreakpointManager().getBreakpoints();
48
	}
49
				
50
	/**
45
	/**
51
	 * Underlying marker.
46
	 * Underlying marker.
52
	 */
47
	 */
53
	private IMarker fMarker= null;
48
	private IMarker fMarker= null;
54
	
49
50
    /**
51
     * Default constructor used to ensure that breakpoint manager is initialized.
52
     */
53
    public Breakpoint() {
54
        // making sure that the BreakpointManager is correctly initialized
55
        // before any breakpoint marker related operation (see bug 54993)
56
        ((BreakpointManager)DebugPlugin.getDefault().getBreakpointManager()).ensureBreakpointsInitialized();
57
    }
58
                
59
55
	/**
60
	/**
56
	 * @see IBreakpoint#setMarker(IMarker)
61
	 * @see IBreakpoint#setMarker(IMarker)
57
	 */
62
	 */
(-)a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java (+7 lines)
Lines 394-399 Link Here
394
	}
394
	}
395
	
395
	
396
	/**
396
	/**
397
	 * Calls {@link #initializeBreakpoints()} if breakpoints have not yet been initialized.
398
	 */
399
	public void ensureBreakpointsInitialized() {
400
	    getBreakpoints0();
401
	}
402
	
403
	/**
397
	 * The BreakpointManager waits to load the breakpoints
404
	 * The BreakpointManager waits to load the breakpoints
398
	 * of the workspace until a request is made to retrieve the 
405
	 * of the workspace until a request is made to retrieve the 
399
	 * breakpoints.
406
	 * breakpoints.

Return to bug 345298