diff options
| -rw-r--r-- | org.eclipse.debug.core/buildnotes_platform-debug.html | 1 | ||||
| -rw-r--r-- | org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/org.eclipse.debug.core/buildnotes_platform-debug.html b/org.eclipse.debug.core/buildnotes_platform-debug.html index 8cf2a05cc..4e7c9c7ac 100644 --- a/org.eclipse.debug.core/buildnotes_platform-debug.html +++ b/org.eclipse.debug.core/buildnotes_platform-debug.html @@ -60,6 +60,7 @@ <h2>June 5, 2008</h2> <h3>Problem Reports Fixed</h3> +<a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=236922">Bug 236922</a>: external tool builder does not run<br> <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=235824">Bug 235824</a>: [doc] Help topics missing<br> <h2>June 2, 2008</h2> diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java index 1ec3efb83..0bf194120 100644 --- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java +++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java @@ -25,7 +25,6 @@ import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.URI; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -1372,11 +1371,12 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe */ public ILaunchConfiguration getLaunchConfiguration(IFile file) { hookResourceChangeListener(); - URI uri = file.getLocationURI(); - if(uri != null) { - return new LaunchConfiguration(new Path(uri.getPath())); + IPath location = file.getLocation(); + if (location != null) { + return new LaunchConfiguration(location); } - return new LaunchConfiguration(file.getLocation()); + // bug 199294: avoid NPE, but return a bogus launch configuration that does not exist + return new LaunchConfiguration(file.getFullPath()); } /** |