From df4dc7f6770dae854eb120eae9328dbc5e68275a Mon Sep 17 00:00:00 2001 From: Egor Ushakov Date: Tue, 16 Sep 2025 16:44:45 +0200 Subject: [PATCH] [debugger] fixed NPE in local tests execution GitOrigin-RevId: 090c306f955224d1a09293f788f4325d212a389a --- .../com/intellij/debugger/engine/DebugProcessImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java index 05de8d0a28a4..7afed4a96093 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java @@ -686,6 +686,12 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb } } + @Nullable + private String getConnectorArgument(String name) { + Connector.Argument argument = myArguments.get(name); + return argument != null ? argument.value() : null; + } + private void setConnectorArgument(String name, String value) { Connector.Argument argument = myArguments.get(name); if (argument != null) { @@ -720,7 +726,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb // It's a known macOS sandbox restriction. // https://github.com/bazelbuild/bazel/issues/5206#issuecomment-402398624 // This code tries to keep involvement with production flow to a bare minimum - String localAddress = myArguments.get("localAddress").value(); + String localAddress = getConnectorArgument("localAddress"); if (BazelEnvironmentUtil.isBazelTestRun() && OS.CURRENT == OS.macOS && ("localhost".equals(localAddress) || "127.0.0.1".equals(localAddress))) { @@ -770,7 +776,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb // It's a known macOS sandbox restriction. // https://github.com/bazelbuild/bazel/issues/5206#issuecomment-402398624 // This code tries to keep involvement with production flow to a bare minimum - String localAddress = myArguments.get("hostname").value(); + String localAddress = getConnectorArgument("hostname"); if (BazelEnvironmentUtil.isBazelTestRun() && OS.CURRENT == OS.macOS && ("localhost".equals(localAddress) || "127.0.0.1".equals(localAddress))) {