Attachment 195580 Details for Bug 343862 – Fix

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

[patch] Fix

z.infinite.patch (text/plain), 2.82 KB, created by Marc Khouzam

on 2011-05-13 07:13:07 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2011-05-13 07:13:07 EDT

Size: 2.82 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java,v
>retrieving revision 1.34
>diff -u -r1.34 GDBRunControl_7_0_NS.java
>--- src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java	12 Apr 2011 00:44:32 -0000	1.34
>+++ src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java	13 May 2011 11:10:56 -0000
>@@ -1136,7 +1136,7 @@
> 			// another request that we now need to process
> 			RequestMonitor sequenceCompletedRm = new RequestMonitor(getExecutor(), null) {
> 				@Override
>-				protected void handleCompleted() {
>+				protected void handleSuccess() {
> 					 fOngoingOperation = false;
> 					 
> 					 if (fOperationsPending.size() > 0) {
>@@ -1147,6 +1147,15 @@
> 					 }
> 					 // no other rm.done() needs to be called, they have all been handled already
> 				}
>+				@Override
>+				protected void handleFailure() {
>+					// If the sequence failed, we have to give up on the operation(s).
>+					// If we don't, we risk an infinite loop where we try, over and over
>+					// to perform an operation that keeps on failing.
>+					fOngoingOperation = false;
>+					fOperationsPending.clear();
>+					super.handleFailure();
>+				}
> 			};
> 			
> 			getExecutor().execute(new Sequence(getExecutor(), sequenceCompletedRm) {
>Index: src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java,v
>retrieving revision 1.35
>diff -u -r1.35 MIRunControl.java
>--- src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java	10 Apr 2011 01:28:18 -0000	1.35
>+++ src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java	13 May 2011 11:10:56 -0000
>@@ -1139,7 +1139,7 @@
> 			// another request that we now need to process
> 			RequestMonitor sequenceCompletedRm = new RequestMonitor(getExecutor(), null) {
> 				@Override
>-				protected void handleCompleted() {
>+				protected void handleSuccess() {
> 					 fOngoingOperation = false;
> 					 
> 					 if (fOperationsPending.size() > 0) {
>@@ -1150,6 +1150,15 @@
> 					 }
> 					 // no other rm.done() needs to be called, they have all been handled already
> 				}
>+				@Override
>+				protected void handleFailure() {
>+					// If the sequence failed, we have to give up on the operation(s).
>+					// If we don't, we risk an infinite loop where we try, over and over
>+					// to perform an operation that keeps on failing.
>+					fOngoingOperation = false;
>+					fOperationsPending.clear();
>+					super.handleFailure();
>+				}
> 			};
> 			
> 			getExecutor().execute(new Sequence(getExecutor(), sequenceCompletedRm) {

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 343862: 195580 | 195594