Merge pull request #213 from tomohiron/fix_dump_memory

fix dump memory problem
java-native-access · Apr 8, 2013 · 900a68e · 900a68e
2 parents 638135f + 18cd75b
commit 900a68e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,7 +9,7 @@ Features
 
 Bug Fixes
 ---------
-
+* [PR#213](https://github.com/twall/jna/pull/213): Fix `Structure.toString()` not to dump memory when `jna.dump_memory` is false. - [@tomohiron](https://github.com/tomohiron).
 
 Release 3.5.2
 =============

diff --git a/src/com/sun/jna/Structure.java b/src/com/sun/jna/Structure.java
@@ -1295,7 +1295,7 @@ public String toString() {
     }
 
     public String toString(boolean debug) {
-        return toString(0, true, true);
+        return toString(0, true, debug);
     }
 
     private String format(Class type) {

diff --git a/test/com/sun/jna/StructureTest.java b/test/com/sun/jna/StructureTest.java
@@ -1144,6 +1144,10 @@ protected List getFieldOrder() {
         assertTrue("Improperly formatted toString(): expected "
                    + EXPECTED + "\n" + actual,
                    actual.matches(EXPECTED));
+
+        System.setProperty("jna.dump_memory", "false");
+        assertFalse("Doesn't dump memory when jna.dump_memory is false",
+                   s.toString().contains("memory dump"));
     }
 
     public void testNativeMappedWrite() {