From abc01e382e02907d6ab4cbc03df4562953d5ea57 Mon Sep 17 00:00:00 2001 From: Vyacheslav Karpukhin Date: Mon, 30 Jul 2018 17:26:10 +0200 Subject: [PATCH] IDEA-190226 Get rid of using current approach for OSProcessUtil#getCurrentProcessId() --- platform/platform-impl/src/com/intellij/util/Restarter.java | 1 - .../src/com/intellij/execution/process/WinProcessManager.java | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/util/Restarter.java b/platform/platform-impl/src/com/intellij/util/Restarter.java index 37ba227bd108..937ace21c409 100644 --- a/platform/platform-impl/src/com/intellij/util/Restarter.java +++ b/platform/platform-impl/src/com/intellij/util/Restarter.java @@ -256,7 +256,6 @@ public class Restarter { @SuppressWarnings({"SameParameterValue", "UnusedReturnValue"}) private interface Kernel32 extends StdCallLibrary { - int GetCurrentProcessId(); WString GetCommandLineW(); Pointer LocalFree(Pointer pointer); WinDef.DWORD GetModuleFileNameW(WinDef.HMODULE hModule, char[] lpFilename, WinDef.DWORD nSize); diff --git a/platform/util/src/com/intellij/execution/process/WinProcessManager.java b/platform/util/src/com/intellij/execution/process/WinProcessManager.java index c3d9c96486ef..4f8080f1127f 100644 --- a/platform/util/src/com/intellij/execution/process/WinProcessManager.java +++ b/platform/util/src/com/intellij/execution/process/WinProcessManager.java @@ -6,7 +6,6 @@ import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ReflectionUtil; -import com.sun.jna.Native; import com.sun.jna.Pointer; import com.sun.jna.platform.win32.Kernel32; import com.sun.jna.platform.win32.WinNT; @@ -44,8 +43,7 @@ public class WinProcessManager { } public static int getCurrentProcessId() { - Kernel32 kernel32 = Native.loadLibrary("kernel32", Kernel32.class); - return kernel32.GetCurrentProcessId(); + return Kernel32.INSTANCE.GetCurrentProcessId(); } public static boolean kill(Process process, boolean tree) {