# HG changeset patch # User l12wang # Date 1264721634 21600 # Node ID 6cbf17faf712fd4904b3e9bd370b8804ba80bd36 # Parent 51404ed29eed33e5e9ff4bc5e64bbf0121e8dca5 Fixed a NPE. Note it's already fixed in CDT head. diff -r 51404ed29eed -r 6cbf17faf712 cdt/cdt_6_0_x/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java --- a/cdt/cdt_6_0_x/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java Thu Jan 14 17:13:39 2010 -0600 +++ b/cdt/cdt_6_0_x/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java Thu Jan 28 17:33:54 2010 -0600 @@ -2448,6 +2448,13 @@ @DsfServiceEventHandler public void handleEvent(IExitedDMEvent event) { + // Note we may get more than one ExitedDMEvent for contexts + // (threads, processes, etc.) in this debug session. So check + // for NPE. + // This is already fixed in CDT head....01/28/10 + if (fTargetContext == null) + return; + final IExecutionDMContext context= event.getDMContext(); if (context.equals(fTargetContext) || DMContexts.isAncestorOf(fTargetContext, context)) {