Bug 216092

2 files changed, 13 insertions, 6 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 32887939202..47566ecd4b4 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
@@ -529,8 +529,10 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
 				int newLineNumber = movedEvent.getNewLocation().getLineNumber();
 				int currLineNumber = breakpoint.getMarker().getAttribute(IMarker.LINE_NUMBER, newLineNumber);
 				breakpoint.getMarker().setAttribute(IMarker.LINE_NUMBER, newLineNumber);
-				fBreakpointProblems.add(BreakpointProblems.reportBreakpointMoved(
-						breakpoint, currLineNumber, newLineNumber, getDebugTarget().getName(), getDebugTarget().getInternalID()));
+				IMarker marker = BreakpointProblems.reportBreakpointMoved(
+						breakpoint, currLineNumber, newLineNumber, getDebugTarget().getName(), getDebugTarget().getInternalID());
+				if (marker != null)
+					fBreakpointProblems.add(marker);
 			} catch (CoreException e) {}
 		}
 		
@@ -704,7 +706,9 @@ public class CBreakpointManager implements IBreakpointsListener, IBreakpointMana
 					String fileName = breakpoint.getFileName();
 					ICDIFunctionLocation location = cdiTarget.createFunctionLocation( fileName, function );
 					ICDICondition condition = createCondition( breakpoint );
-					fBreakpointProblems.add(BreakpointProblems.reportUnresolvedBreakpoint(breakpoint, getDebugTarget().getName(), getDebugTarget().getInternalID()));
+					IMarker marker = BreakpointProblems.reportUnresolvedBreakpoint(breakpoint, getDebugTarget().getName(), getDebugTarget().getInternalID());
+					if (marker != null)
+						fBreakpointProblems.add(marker);
 					if (bpManager2 != null)
 						b = bpManager2.setFunctionBreakpoint( ICDIBreakpoint.REGULAR, location, condition, true, breakpoints[i].isEnabled() );
 					else
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java
index 3a502d0fe59..1e446026114 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/BreakpointProblems.java
@@ -124,9 +124,12 @@ public class BreakpointProblems {
 							lineBreakpoint.getMarker().getResource(),
 							lineBreakpoint.getLineNumber(), description, severity,
 							"")); //$NON-NLS-1$
-					marker.setAttribute(BREAKPOINT_PROBLEM_TYPE, problemType);
-					marker.setAttribute(BREAKPOINT_CONTEXT_NAME, contextName);
-					marker.setAttribute(BREAKPOINT_CONTEXT_ID, contextID);
+					if (marker != null)
+					{
+						marker.setAttribute(BREAKPOINT_PROBLEM_TYPE, problemType);
+						marker.setAttribute(BREAKPOINT_CONTEXT_NAME, contextName);
+						marker.setAttribute(BREAKPOINT_CONTEXT_ID, contextID);						
+					}
 				}
 				return marker;
 			}