From ec4d115af34726244c45c520d82b3767ca5b90ff Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Sun, 23 Jan 2011 03:09:28 +0000 Subject: [PATCH] Bug 335099 - [tests] NPE at the end of the JUnit tests when running headless --- .../ui/console/TracingConsoleManager.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/TracingConsoleManager.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/TracingConsoleManager.java index 94fdc8e125f..70a4d05f244 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/TracingConsoleManager.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/TracingConsoleManager.java @@ -146,13 +146,17 @@ public class TracingConsoleManager implements ILaunchesListener2, IPropertyChang } private TracingConsole getConsole(ILaunch launch) { - IConsoleManager manager = ConsolePlugin.getDefault().getConsoleManager(); - IConsole[] consoles = manager.getConsoles(); - for (IConsole console : consoles) { - if (console instanceof TracingConsole) { - TracingConsole tracingConsole = (TracingConsole)console; - if (tracingConsole.getLaunch().equals(launch)) { - return tracingConsole; + ConsolePlugin plugin = ConsolePlugin.getDefault(); + if (plugin != null) { + // I've seen the plugin be null when running headless JUnit tests + IConsoleManager manager = plugin.getConsoleManager(); + IConsole[] consoles = manager.getConsoles(); + for (IConsole console : consoles) { + if (console instanceof TracingConsole) { + TracingConsole tracingConsole = (TracingConsole)console; + if (tracingConsole.getLaunch().equals(launch)) { + return tracingConsole; + } } } }