Bug 287829 - NPE in ConsoleView

1 files changed, 12 insertions, 10 deletions

diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
index 3289a1b61..31c867809 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 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
@@ -479,15 +479,17 @@ public class ConsoleView extends PageBookView implements IConsoleView, IConsoleL
 				tb.addMouseListener(new MouseAdapter() {
 					public void mouseDown(MouseEvent e) {
 						ToolItem ti= tb.getItem(new Point(e.x, e.y));
-						if (ti.getData() instanceof ActionContributionItem) {
-							ActionContributionItem actionContributionItem= (ActionContributionItem) ti.getData();
-							IAction action= actionContributionItem.getAction();
-							if (action == fOpenConsoleAction) {
-								Event event= new Event();
-								event.widget= ti;
-								event.x= e.x;
-								event.y= e.y;
-								action.runWithEvent(event);
+						if (ti != null) {
+							if (ti.getData() instanceof ActionContributionItem) {
+								ActionContributionItem actionContributionItem= (ActionContributionItem) ti.getData();
+								IAction action= actionContributionItem.getAction();
+								if (action == fOpenConsoleAction) {
+									Event event= new Event();
+									event.widget= ti;
+									event.x= e.x;
+									event.y= e.y;
+									action.runWithEvent(event);
+								}
 							}
 						}
 					}