From 1416fa73c35e7eb8684b4d5015e3ab5653ef994d Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Thu, 30 Oct 2003 18:15:02 +0000 Subject: [PATCH] Fix for PR 45818: NPE when closing the workbench. --- debug/org.eclipse.cdt.debug.core/ChangeLog | 4 ++++ .../eclipse/cdt/debug/internal/core/model/CDebugElement.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index 928b8a722d0..6c44b8c5de5 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,7 @@ +2003-10-30 Mikhail Khodjaiants + Fix for PR 45818: NPE when closing the workbench. + * CDebugElement.java + 2003-10-29 Mikhail Khodjaiants * CProjectSourceLocation.java: check if the searched element name is not null or empty. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java index 82807174ca1..c0ae65fbc32 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugElement.java @@ -122,7 +122,8 @@ public class CDebugElement extends PlatformObject */ protected void fireEvent(DebugEvent event) { - DebugPlugin.getDefault().fireDebugEventSet( new DebugEvent[] { event } ); + if ( DebugPlugin.getDefault() != null ) // Quick fix for PR 45818. Revise later. + DebugPlugin.getDefault().fireDebugEventSet( new DebugEvent[] { event } ); } /**