Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Cortell2010-03-02 23:13:33 +0000
committerJohn Cortell2010-03-02 23:13:33 +0000
commit8868796244ab138e9d1c0b003fb1e226c660522c (patch)
treecd25b3273f9355028289b26fd51313c257732ff7 /dsf/org.eclipse.cdt.dsf
parent324bc25ac90d349ecb03983d5d98cd776900c8e4 (diff)
downloadorg.eclipse.cdt-8868796244ab138e9d1c0b003fb1e226c660522c.tar.gz
org.eclipse.cdt-8868796244ab138e9d1c0b003fb1e226c660522c.tar.xz
org.eclipse.cdt-8868796244ab138e9d1c0b003fb1e226c660522c.zip
[304434] ISourceLookupParticipant.getSourceName(Object) should return null, not empty string
Diffstat (limited to 'dsf/org.eclipse.cdt.dsf')
-rw-r--r--dsf/org.eclipse.cdt.dsf/src/org/eclipse/cdt/dsf/debug/sourcelookup/DsfSourceLookupParticipant.java7
1 files changed, 6 insertions, 1 deletions
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) {

Back to the top