Move NPCAP_DIR to if block.

ardikars · Dec 4, 2023 · 6068d5a · 6068d5a
1 parent cfe8482
commit 6068d5a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/jdk7/src/main/java/pcap/jdk7/internal/NativeMappings.java b/jdk7/src/main/java/pcap/jdk7/internal/NativeMappings.java
@@ -62,10 +62,12 @@ class NativeMappings {
       new HashMap<String, Object>();
 
   static {
-    File NPCAP_DIR = Paths.get(System.getenv("SystemRoot"), "System32", "Npcap").toFile();
+    if (Platform.isWindows() && System.getProperty("jna.library.path") == null) {
+      File NPCAP_DIR = Paths.get(System.getenv("SystemRoot"), "System32", "Npcap").toFile();
 
-    if (Platform.isWindows() && System.getProperty("jna.library.path") == null && NPCAP_DIR.exists()) {
-      NativeLibrary.addSearchPath("wpcap", NPCAP_DIR.getAbsolutePath());
+      if (NPCAP_DIR.exists()) {
+        NativeLibrary.addSearchPath("wpcap", NPCAP_DIR.getAbsolutePath());
+      }
     }
   }