# HG changeset patch
# User stechong
# Date 1267162563 21600
# Node ID f800d58f08b005cce0a2775b8fbf82cfabcccd13
# Parent  6f8730b7758deff2f3628ba1b6ab74a034629139
Better fix for Bug 10689.

diff -r 6f8730b7758d -r f800d58f08b0 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	Wed Feb 24 15:38:39 2010 -0600
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/ExecutablesManager.java	Thu Feb 25 23:36:03 2010 -0600
@@ -105,7 +105,7 @@
 					// store the list of executables for this project
 					synchronized (executablesMap) {
 						List<Executable> executables = provider.getExecutables(project, subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE));
-						if (executables != null) {
+						if (!subMonitor.isCanceled()) {
 							executablesMap.put(project, executables);
 						}
 					}
diff -r 6f8730b7758d -r f800d58f08b0 cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IProjectExecutablesProvider.java
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IProjectExecutablesProvider.java	Wed Feb 24 15:38:39 2010 -0600
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/IProjectExecutablesProvider.java	Thu Feb 25 23:36:03 2010 -0600
@@ -38,7 +38,7 @@
 	 * Get the list of executables for the given project
 	 * @param project the project to get the executables for
 	 * @param monitor progress monitor
-	 * @return the list of executables (which may be empty), or null if request is cancelled
+	 * @return the list of executables (which may be empty)
 	 */
 	List<Executable> getExecutables(IProject project, IProgressMonitor monitor);
 
diff -r 6f8730b7758d -r f800d58f08b0 cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java	Wed Feb 24 15:38:39 2010 -0600
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/executables/StandardExecutableProvider.java	Thu Feb 25 23:36:03 2010 -0600
@@ -55,7 +55,7 @@
 
 			for (IBinary binary : binaries) {
 				if (progress.isCanceled()) {
-					return null;
+					break;
 				}
 
 				if (binary.isExecutable() || binary.isSharedLib()) {