From 9f38ebbab0ed40c12695efa014947f6dacfedd22 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Mon, 4 Dec 2017 18:34:07 +0300 Subject: [PATCH] [grails] disable debugger agent for forked 2.x (IDEA-182962) --- .../debugger/impl/DebuggerManagerImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java index 3dfaf7f43333..0669701ccfcf 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java @@ -422,11 +422,19 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent return DebuggerSettings.getInstance().FORCE_CLASSIC_VM; } + public static RemoteConnection createDebugParameters(final JavaParameters parameters, + final boolean debuggerInServerMode, + int transport, final String debugPort, + boolean checkValidity) throws ExecutionException { + return createDebugParameters(parameters, debuggerInServerMode, transport, debugPort, checkValidity, true); + } + @SuppressWarnings({"HardCodedStringLiteral"}) public static RemoteConnection createDebugParameters(final JavaParameters parameters, final boolean debuggerInServerMode, int transport, final String debugPort, - boolean checkValidity) + boolean checkValidity, + boolean addAsyncDebuggerAgent) throws ExecutionException { if (checkValidity) { checkTargetJPDAInstalled(parameters); @@ -467,7 +475,9 @@ public class DebuggerManagerImpl extends DebuggerManagerEx implements Persistent ApplicationManager.getApplication().runReadAction(() -> { JavaSdkUtil.addRtJar(parameters.getClassPath()); - addDebuggerAgent(parameters); + if (addAsyncDebuggerAgent) { + addDebuggerAgent(parameters); + } final Sdk jdk = parameters.getJdk(); final boolean forceClassicVM = shouldForceClassicVM(jdk);