Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2014-11-11 18:15:58 +0000
committerDani Megert2014-11-11 18:15:58 +0000
commit0a2462ee8c2b56d322d290ca87dc4d5a29330358 (patch)
tree68c81d205fd61e67842bc38087d50ced1205a81a /org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui
parente598699286ab39f12bbcc0d7b1fc2475f11d40f5 (diff)
downloadeclipse.platform.debug-0a2462ee8c2b56d322d290ca87dc4d5a29330358.tar.gz
eclipse.platform.debug-0a2462ee8c2b56d322d290ca87dc4d5a29330358.tar.xz
eclipse.platform.debug-0a2462ee8c2b56d322d290ca87dc4d5a29330358.zip
#getInstructionPointerAnnotation can return 'null'
Diffstat (limited to 'org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui')
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java
index a9c655aa4..3326190b9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/sourcelookup/SourceLookupFacility.java
@@ -42,6 +42,7 @@ import org.eclipse.debug.internal.ui.views.launch.Decoration;
import org.eclipse.debug.internal.ui.views.launch.DecorationManager;
import org.eclipse.debug.internal.ui.views.launch.SourceNotFoundEditorInput;
import org.eclipse.debug.internal.ui.views.launch.StandardDecoration;
+
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.debug.ui.IDebugEditorPresentation;
import org.eclipse.debug.ui.IDebugModelPresentation;
@@ -439,7 +440,9 @@ public class SourceLookupFacility implements IPageListener, IPartListener2, IPro
positionEditor(textEditor, frame);
InstructionPointerManager.getDefault().removeAnnotations(textEditor);
Annotation annotation = fPresentation.getInstructionPointerAnnotation(textEditor, frame);
- InstructionPointerManager.getDefault().addAnnotation(textEditor, frame, annotation);
+ if (annotation != null) {
+ InstructionPointerManager.getDefault().addAnnotation(textEditor, frame, annotation);
+ }
}
}
}

Back to the top