mmerge RCL_2_4
authordadubrow
Tue, 13 Apr 2010 09:45:35 -0500
branchRCL_2_4
changeset 139 3b27a90d6161
parent 138 e0657161c0cc (current diff)
parent 136 c488f61fb898 (diff)
child 140 6d6cf3bdff43
mmerge
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java	Mon Apr 12 15:01:49 2010 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java	Tue Apr 13 09:45:35 2010 -0500
@@ -104,7 +104,10 @@
 
 					// store the list of executables for this project
 					synchronized (executablesMap) {
-						executablesMap.put(project, provider.getExecutables(project, subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE)));
+						List<Executable> executables = provider.getExecutables(project, subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE));
+						if (!subMonitor.isCanceled()) {
+							executablesMap.put(project, executables);
+						}
 					}
 				}
 			}