# HG changeset patch
# User dadubrow
# Date 1271169935 18000
# Node ID 3b27a90d61619c9ca1b4305ced5fad0309dcd467
# Parent  e0657161c0cce46b99cd9d3762fe90b80eb32df5# Parent  c488f61fb898ed69500d55dc2ce5b33c2e219b1b
mmerge

diff -r e0657161c0cc -r 3b27a90d6161 cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java
--- 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);
+						}
 					}
 				}
 			}
diff -r e0657161c0cc -r 3b27a90d6161 cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IProjectExecutablesProvider.java
diff -r e0657161c0cc -r 3b27a90d6161 cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java