From 83332ab6f888823dd7b95e54b58f49831ce495d5 Mon Sep 17 00:00:00 2001 From: John Cortell Date: Wed, 30 Apr 2008 22:57:21 +0000 Subject: [PATCH] Fix NPE in action adapters when editor is not fed by a file. --- .../cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java | 4 +++- .../cdt/debug/internal/ui/actions/RunToLineAdapter.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java index 8dc867fd748..3c608bc6227 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ResumeAtLineAdapter.java @@ -152,11 +152,13 @@ public class ResumeAtLineAdapter implements IResumeAtLineTarget { if ( document == null ) { return false; } - String fileName; // actually, absolute path, not just file name + String fileName = null; // actually, absolute path, not just file name try { fileName = getFileName( input ); } catch( CoreException e ) { + } + if (fileName == null) { return false; } IDebugTarget debugTarget = null; diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java index c7c2d804ed2..df774f324b2 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RunToLineAdapter.java @@ -155,11 +155,13 @@ public class RunToLineAdapter implements IRunToLineTarget { if ( document == null ) { return false; } - String fileName; // actually, absolute path, not just file name + String fileName = null; // actually, absolute path, not just file name try { fileName = getFileName( input ); } catch( CoreException e ) { + } + if (fileName == null) { return false; } IDebugTarget debugTarget = null;