From 387831443806cd4ba8579eda090dbba05026d3df Mon Sep 17 00:00:00 2001
From: Dani Megert
Date: Thu, 14 May 2015 11:17:15 +0200
Subject: Fixed bug 467309: NPE in LaunchViewBreadcrumb.dispose

---
 .../debug/internal/ui/views/launch/LaunchViewBreadcrumb.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'org.eclipse.debug.ui')

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java
index 6bb242385..00597dbb4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewBreadcrumb.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Wind River Systems and others.
+ * Copyright (c) 2009, 2015 Wind River Systems 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
@@ -320,10 +320,12 @@ public class LaunchViewBreadcrumb extends AbstractBreadcrumb implements IDebugCo
 
     @Override
 	public void dispose() {
-        fBreadcrumbContextProvider = null;
         fTreeViewerContextProvider.removeDebugContextListener(this);
         fTreeViewer.removeLabelUpdateListener(this);
-        fBreadcrumbContextProvider.dispose();
+        if (fBreadcrumbContextProvider != null) {
+            fBreadcrumbContextProvider.dispose();
+            fBreadcrumbContextProvider = null;
+        }
         fViewer = null;
         super.dispose();
     }
-- 
cgit v1.2.3