Bug 565179 - Exception processing async thread queue gives NPE while evaluating ConditionalBreakpoint Change-Id: Ie4634c1b115f2ca440df626ee35c4c47a7ee058e
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java index 79e66c0..57a1473 100644 --- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java +++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/breakpoints/ConditionalBreakpointHandler.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 IBM Corporation and others. + * Copyright (c) 2009, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -107,6 +107,9 @@ JDIThread thread = (JDIThread) result.getThread(); if (result.hasErrors()) { DebugException exception = result.getException(); + if (exception == null) { + return DONT_SUSPEND; + } Throwable wrappedException = exception.getStatus() .getException(); if (wrappedException instanceof VMDisconnectedException) {