From eb4842352a62f2909f86100dfcdb73fd7e26311a Mon Sep 17 00:00:00 2001 From: Egor Ushakov Date: Tue, 7 Nov 2017 15:42:27 +0300 Subject: [PATCH] IDEA-180314 ISE at com.intellij.debugger.engine.DebugProcessImpl.getVirtualMachineProxy - fix for IDEA-CR-26490 --- .../src/com/intellij/debugger/engine/DebugProcessEvents.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessEvents.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessEvents.java index c195ec6fa753..6fe67b27c882 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessEvents.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessEvents.java @@ -376,9 +376,9 @@ public class DebugProcessEvents extends DebugProcessImpl { }); } - private void processVMDeathEvent(SuspendContextImpl suspendContext, Event event) { + private void processVMDeathEvent(SuspendContextImpl suspendContext, @Nullable Event event) { // do not destroy another process on reattach - if (isAttached() && getVirtualMachineProxy().getVirtualMachine() == event.virtualMachine()) { + if (isAttached() && (event == null || getVirtualMachineProxy().getVirtualMachine() == event.virtualMachine())) { try { preprocessEvent(suspendContext, null); cancelRunToCursorBreakpoint();