From 8868796244ab138e9d1c0b003fb1e226c660522c Mon Sep 17 00:00:00 2001 From: John Cortell Date: Tue, 2 Mar 2010 23:13:33 +0000 Subject: [PATCH] [304434] ISourceLookupParticipant.getSourceName(Object) should return null, not empty string --- .../dsf/debug/sourcelookup/DsfSourceLookupParticipant.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java index 722d467b394..bdf571366b3 100644 --- a/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java +++ b/dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java @@ -193,7 +193,12 @@ public class DsfSourceLookupParticipant implements ISourceLookupParticipant { }}; fExecutor.execute(query); try { - return query.get(); + String result = query.get(); + if ((result != null) && (result.length() == 0)) { + // interface javadoc says we should return null + result = null; + } + return result; } catch (InterruptedException e) { assert false : "Interrupted exception in DSF executor"; //$NON-NLS-1$ } catch (ExecutionException e) { if (e.getCause() instanceof CoreException) {