Fix Sysinfo FieldOrder

Fixes: #1027
java-native-access · Oct 16, 2018 · 475ae60 · 475ae60
1 parent 41d5123
commit 475ae60
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,6 +11,7 @@ Features
 Bug Fixes
 ---------
 * [#1025](https://github.com/java-native-access/jna/pull/1025): Restore java 6 compatibility and introduce animal-sniffer to prevent regressions - [@matthiasblaesing](https://github.com/matthiasblaesing).
+* [#1028](https://github.com/java-native-access/jna/pull/1028): Fix Linux LibC.Sysinfo FieldOrder - [@dbwiddis](https://github.com/dbwiddis).
 
 Release 5.0.0
 =============

diff --git a/contrib/platform/src/com/sun/jna/platform/linux/LibC.java b/contrib/platform/src/com/sun/jna/platform/linux/LibC.java
@@ -89,8 +89,8 @@ protected List<Field> getFieldList() {
         @Override
         protected List<String> getFieldOrder() {
             List<String> fieldOrder = new ArrayList<String>(super.getFieldOrder());
-            if (PADDING_SIZE > 0) {
-                fieldOrder.add("_f");
+            if (PADDING_SIZE == 0) {
+                fieldOrder.remove("_f");
             }
             return fieldOrder;
         }

diff --git a/src/com/sun/jna/Structure.java b/src/com/sun/jna/Structure.java
@@ -1061,7 +1061,10 @@ protected List<Field> getFields(boolean force) {
         if (fieldOrder.size() != flist.size() && flist.size() > 1) {
             if (force) {
                 throw new Error("Structure.getFieldOrder() on " + getClass()
-                                + " does not provide enough names [" + fieldOrder.size()
+                                + (fieldOrder.size() < flist.size() 
+                                    ? " does not provide enough" 
+                                    : " provides too many")
+                                + " names [" + fieldOrder.size()
                                 + "] ("
                                 + sort(fieldOrder)
                                 + ") to match declared fields [" + flist.size()