From 3a06a2bba9139e9bd654857d2eb55dfa8f039811 Mon Sep 17 00:00:00 2001 From: Egor Ushakov Date: Mon, 6 Aug 2018 19:30:19 +0300 Subject: [PATCH] compare jdk version strings correctly it was failing to match "java version "1.8.0_152"" and "1.8.0_152-release" --- .../src/com/intellij/debugger/engine/DebugProcessImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 72e1f8236c73..e6f0c0e7e55d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java @@ -64,6 +64,7 @@ import com.intellij.util.Consumer; import com.intellij.util.EventDispatcher; import com.intellij.util.concurrency.Semaphore; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.lang.JavaVersion; import com.intellij.util.ui.UIUtil; import com.intellij.xdebugger.XDebugSession; import com.intellij.xdebugger.XSourcePosition; @@ -611,7 +612,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb private static boolean versionMatch(@Nullable Sdk sdk, String version) { if (sdk != null && sdk.getSdkType() instanceof JavaSdkType) { String versionString = sdk.getVersionString(); - return versionString != null && versionString.contains(version); + return versionString != null && Objects.equals(JavaVersion.tryParse(versionString),JavaVersion.tryParse(version)); } return false; }