Fixed source lookup in TCF/DSF integration

2 files changed, 6 insertions, 2 deletions

diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupDirector.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupDirector.java
index c34a9ae9a..2e044bd0b 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupDirector.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/launch/TCFSourceLookupDirector.java
@@ -14,8 +14,8 @@ import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector;
 import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant;
 
 /**
- * TCF source lookup director. For TCF source lookup there is one source lookup
- * participant.
+ * TCF source lookup director.
+ * For TCF source lookup there is one source lookup participant.
  */
 public class TCFSourceLookupDirector extends AbstractSourceLookupDirector {
 
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java
index 8e5283dd7..f1c62b3ab 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/model/TCFLaunch.java
@@ -143,6 +143,10 @@ public class TCFLaunch extends Launch {
     protected void runLaunchSequence(final Runnable done) {
         try {
             ILaunchConfiguration cfg = getLaunchConfiguration();
+            if (cfg == null) {
+                Protocol.invokeLater(done);
+                return;
+            }
             final String file = cfg.getAttribute(TCFLaunchDelegate.ATTR_PROGRAM_FILE, "");
             if (file.length() == 0) {
                 Protocol.invokeLater(done);