Don't log failure in setting breakpoint as error in Error Log view.
authorl12wang
Tue, 24 Nov 2009 19:18:36 -0600
changeset 118 f0e9dc42b68e
parent 117 09f3d307f081
child 119 96004bdb2ebe
child 123 71e3840b8eca
Don't log failure in setting breakpoint as error in Error Log view.
cdt/cdt_6_0_x/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator.java
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator.java	Mon Nov 23 00:59:16 2009 -0600
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/service/BreakpointsMediator.java	Tue Nov 24 19:18:36 2009 -0600
@@ -648,7 +648,7 @@
 		return bpsInfo.toArray(new PlatformBreakpointInfo[bpsInfo.size()]);
 	}
 
-	protected void doBreakpointsAddedInExecutor(PlatformBreakpointInfo[] bpsInfo, Collection<IBreakpointsTargetDMContext> bpTargetDMCs, RequestMonitor rm) {
+	protected void doBreakpointsAddedInExecutor(PlatformBreakpointInfo[] bpsInfo, Collection<IBreakpointsTargetDMContext> bpTargetDMCs, final RequestMonitor rm) {
 		final Map<IBreakpoint, Map<IBreakpointsTargetDMContext, ITargetBreakpointInfo[]>> eventBPs =  
 			new HashMap<IBreakpoint, Map<IBreakpointsTargetDMContext, ITargetBreakpointInfo[]>>(bpsInfo.length, 1);
 		
@@ -657,7 +657,11 @@
                 protected void handleCompleted() {
                 	processPendingRequests();
                 	fireUpdateBreakpointsStatus(eventBPs, BreakpointEventType.ADDED);
-                    super.handleCompleted();
+                	if (rm != null)
+                		// don't call this if "rm" is null as this will 
+                		// log errors if any and pack Eclipse error 
+                		// log view with errors useless to user. 
+                		super.handleCompleted();
                 }
             };	            	
         int processPendingCountingRmCount = 0;
@@ -936,7 +940,7 @@
 	}
 	
 	protected void doBreakpointsRemovedInExecutor(IBreakpoint[] bpCandidates, 
-			Collection<IBreakpointsTargetDMContext> targetContexts, RequestMonitor rm) {
+			Collection<IBreakpointsTargetDMContext> targetContexts, final RequestMonitor rm) {
 		
 		final Map<IBreakpoint, Map<IBreakpointsTargetDMContext, ITargetBreakpointInfo[]>> eventBPs =  
 			new HashMap<IBreakpoint, Map<IBreakpointsTargetDMContext, ITargetBreakpointInfo[]>>(bpCandidates.length, 1);
@@ -946,7 +950,11 @@
 			protected void handleCompleted() {
 				processPendingRequests();
             	fireUpdateBreakpointsStatus(eventBPs, BreakpointEventType.REMOVED);
-				super.handleCompleted();
+            	if (rm != null)
+            		// don't call this if "rm" is null as this will 
+            		// log errors if any and pack Eclipse error 
+            		// log view with errors useless to user. 
+            		super.handleCompleted();
 			}
 		};
 		int processPendingCountingRmCount = 0;