MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-debugger][IDEA-375478] isolated the method of debugger agent setup into a separate method

Browse Source 
GitOrigin-RevId: 2c87d0778e8beedaaa21bfcc6a24cc9e96e0fa17
This commit is contained in:
Alexander.Glukhov
2025-07-09 18:19:45 +00:00
committed by intellij-monorepo-bot
parent 1f41a5f75f
commit 8df0382e19
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/AsyncStacksUtils.java
+23 -18
View File
@@ -303,24 +303,29 @@ public final class AsyncStacksUtils {
@Nullable Project project,
boolean checkJdkVersion,
@Nullable Disposable disposable) {
if (!isAgentEnabled()) {
return;
}
String prefix = "-javaagent:";
ParametersList parametersList = parameters.getVMParametersList();
if (ContainerUtil.exists(parametersList.getParameters(), p -> p.startsWith(prefix) && p.contains(AGENT_JAR_NAME))) {
return;
}
Sdk jdk = parameters.getJdk();
if (checkJdkVersion && jdk == null) {
return;
}
JavaSdkVersion sdkVersion = jdk != null ? JavaSdk.getInstance().getVersion(jdk) : null;
if (checkJdkVersion && (sdkVersion == null || !sdkVersion.isAtLeast(JavaSdkVersion.JDK_1_7))) {
LOG.warn("Capture agent is not supported for JRE " + sdkVersion);
return;
}
if (isAgentEnabled()) {
String prefix = "-javaagent:";
ParametersList parametersList = parameters.getVMParametersList();
if (!ContainerUtil.exists(parametersList.getParameters(), p -> p.startsWith(prefix) && p.contains(AGENT_JAR_NAME))) {
Sdk jdk = parameters.getJdk();
if (checkJdkVersion && jdk == null) {
return;
}
JavaSdkVersion sdkVersion = jdk != null ? JavaSdk.getInstance().getVersion(jdk) : null;
if (checkJdkVersion && (sdkVersion == null || !sdkVersion.isAtLeast(JavaSdkVersion.JDK_1_7))) {
LOG.warn("Capture agent is not supported for JRE " + sdkVersion);
return;
}
extendParametersForAgent(project, disposable, parametersList, prefix);
}
}
}
private static void extendParametersForAgent(@Nullable Project project,
@Nullable Disposable disposable,
@NotNull ParametersList parametersList,
@NotNull String prefix) {
String agentPath = getAgentArtifactPath(project, disposable);
if (agentPath != null) {
try (AccessToken ignore = SlowOperations.knownIssue("IDEA-307303, EA-835503")) {
@@ -364,9 +369,9 @@ public final class AsyncStacksUtils {
}
}
// Code runs from IDEA run configuration (code from .class file in out/ directory)
@NativePath
private static @NotNull String getArtifactPathForDownloadedAgent(@Nullable Project project, @Nullable Disposable disposable) {
// Code runs from IDEA run configuration (code from .class file in out/ directory)
try {
Path agentArtifactPath = createTemporaryAgentPath(project, disposable);