Windows, JNI: do not load windows_jni.dll twice.

WindowsProcesses.ensureJni() was duplicating the work of
WindowsJniLoader.loadJni(); this change removes the former and
replaces the only call site with the latter.

--
MOS_MIGRATED_REVID=131806917

1 files changed, 1 insertions, 11 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/windows/WindowsProcesses.java b/src/main/java/com/google/devtools/build/lib/windows/WindowsProcesses.java
index 5774f0f26b..67d6362afd 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/WindowsProcesses.java
+++ b/src/main/java/com/google/devtools/build/lib/windows/WindowsProcesses.java
@@ -22,7 +22,6 @@ import java.util.List;
 public class WindowsProcesses {
   public static final long INVALID = -1;
 
-  private static boolean jniLoaded = false;
   private WindowsProcesses() {
     // Prevent construction
   }
@@ -132,19 +131,10 @@ public class WindowsProcesses {
   static native String nativeStreamGetLastError(long process);
 
   public static int getpid() {
-    ensureJni();
+    WindowsJniLoader.loadJni();
     return nativeGetpid();
   }
 
-  private static synchronized void ensureJni() {
-    if (jniLoaded) {
-      return;
-    }
-
-    System.loadLibrary("windows_jni");
-    jniLoaded = true;
-  }
-
   static String quoteCommandLine(List<String> argv) {
     StringBuilder result = new StringBuilder();
     for (int iArg = 0; iArg < argv.size(); iArg++) {