Update to use JNA 4.1.0. [JENKINS-24521]

jenkinsci · Oct 14, 2014 · 5c4f38d · 5c4f38d
1 parent 3fef06f
commit 5c4f38d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
-      <version>3.0.3-patch-1</version>
+      <version>4.1.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/src/main/java/org/jvnet/hudson/Windows.java b/src/main/java/org/jvnet/hudson/Windows.java
@@ -26,6 +26,8 @@
 import com.sun.jna.Native;
 import com.sun.jna.Structure;
 import com.sun.jna.win32.StdCallLibrary;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * {@link MemoryMonitor} implementation for Windows.
@@ -62,5 +64,12 @@ public static final class MEMORYSTATUSEX extends Structure {
         public long ullTotalVirtual;
         public long ullAvailVirtual;
         public long ullAvailExtendedVirtual;
-    }
+
+        @Override
+        protected List getFieldOrder() {
+            return Arrays.asList("dwLength", "dwMemoryLoad", "ullTotalPhys",
+                "ullAvailPhys", "ullTotalPageFile", "ullAvailPageFile",
+                "ullTotalVirtual", "ullAvailVirtual", "ullAvailExtendedVirtual");
+        }
+    }  
 }