Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Birenheide2015-02-24 10:59:22 +0000
committerSarika Sinha2015-02-24 10:59:22 +0000
commitcb8b3aa793b6a92b5bf3aa6c36bdeb4d35328a46 (patch)
tree5b340ff6c296ffc790558f48d0d00c95fc2905a3
parente934ec6178b49b12027eeb6836ea0f1eb25b3630 (diff)
downloadeclipse.platform.debug-cb8b3aa793b6a92b5bf3aa6c36bdeb4d35328a46.tar.gz
eclipse.platform.debug-cb8b3aa793b6a92b5bf3aa6c36bdeb4d35328a46.tar.xz
eclipse.platform.debug-cb8b3aa793b6a92b5bf3aa6c36bdeb4d35328a46.zip
Bug 459664 - InstructionPointerImageProvider throws CCE for nonI20150224-0800
InstructionPointerAnnotation Change-Id: Ib55ae4044285b4254cce1d2eded40bf9752b37d3 Signed-off-by: Richard Birenheide <richard.birenheide@sap.com>
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java
index da3e4857c..27e02df18 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Richard Birenheide - Bug 459664
*******************************************************************************/
package org.eclipse.debug.internal.ui;
@@ -23,7 +24,12 @@ public class InstructionPointerImageProvider implements IAnnotationImageProvider
*/
@Override
public Image getManagedImage(Annotation annotation) {
- return ((InstructionPointerAnnotation)annotation).getImage();
+ if (annotation instanceof InstructionPointerAnnotation) {
+ return ((InstructionPointerAnnotation) annotation).getImage();
+ } else {
+ return null;
+ }
+
}
/* (non-Javadoc)

Back to the top