Merge pull request msgpack#239 from msgpack/issue_233

komamitsu · komamitsu · commit 97e0bcef5d49 · 2015-05-26T01:54:16.000+09:00
Issue 233
diff --git a/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java b/msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java
@@ -330,8 +330,10 @@ public void close() throws IOException {
             flush();
         }
         finally {
-            MessagePacker messagePacker = getMessagePacker();
-            messagePacker.close();
+            if (isEnabled(Feature.AUTO_CLOSE_TARGET)) {
+                MessagePacker messagePacker = getMessagePacker();
+                messagePacker.close();
+            }
         }
     }
 
diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackGeneratorTest.java b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackGeneratorTest.java
@@ -25,6 +25,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
@@ -263,4 +264,24 @@ public void testBigDecimal() throws IOException {
             }
         }
     }
+
+    @Test
+    public void testDisableFeatureAutoCloseTarget() throws IOException {
+        File tempFile = File.createTempFile("test", "msgpack");
+        tempFile.deleteOnExit();
+        FileOutputStream out = new FileOutputStream(tempFile);
+        MessagePackFactory messagePackFactory = new MessagePackFactory();
+        messagePackFactory.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+        ObjectMapper objectMapper = new ObjectMapper(messagePackFactory);
+        List<Integer> integers = Arrays.asList(1);
+        objectMapper.writeValue(out, integers);
+        objectMapper.writeValue(out, integers);
+        out.close();
+
+        MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(new FileInputStream(tempFile));
+        assertEquals(1, unpacker.unpackArrayHeader());
+        assertEquals(1, unpacker.unpackInt());
+        assertEquals(1, unpacker.unpackArrayHeader());
+        assertEquals(1, unpacker.unpackInt());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -330,8 +330,10 @@ public void close() throws IOException {`
`330`	`330`	`flush();`
`331`	`331`	`}`
`332`	`332`	`finally {`
`333`		`- MessagePacker messagePacker = getMessagePacker();`
`334`		`- messagePacker.close();`
	`333`	`+ if (isEnabled(Feature.AUTO_CLOSE_TARGET)) {`
	`334`	`+ MessagePacker messagePacker = getMessagePacker();`
	`335`	`+ messagePacker.close();`
	`336`	`+ }`
`335`	`337`	`}`
`336`	`338`	`}`
`337`	`339`