Skip to content

Issue 233 #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
komamitsu merged 2 commits into from
May 25, 2015
Merged

Issue 233 #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dad4a73
Consider JsonGenerator.Feature#AUTO_CLOSE_TARGET
komamitsu May 25, 2015
a785c91
Improve MessagePackGeneratorTest
komamitsu May 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions msgpack-jackson/src/main/java/org/msgpack/jackson/dataformat/MessagePackGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
}

Expand Down
21 changes: 21 additions & 0 deletions msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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());
}
}