Skip to content

Patches over read when use raw binary streaming write. #25

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
merged 1 commit into from
Jul 15, 2015
Merged

Patches over read when use raw binary streaming write. #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/main/java/com/fasterxml/jackson/dataformat/smile/SmileGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1943,6 +1943,9 @@ private final int _writeBytes(InputStream in, int bytesLeft) throws IOException
_flushBuffer();
room = _outputEnd - _outputTail;
}
if (room > bytesLeft) {
room = bytesLeft;
}
int count = in.read(_outputBuffer, _outputTail, room);
if (count < 0) {
break;
Expand Down
32 changes: 32 additions & 0 deletions src/test/java/com/fasterxml/jackson/dataformat/smile/TestSmileGeneratorBinary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.junit.Assert;

import com.fasterxml.jackson.core.*;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator.Feature;

public class TestSmileGeneratorBinary extends SmileTestBase
{
Expand Down Expand Up @@ -60,6 +61,37 @@ public void testBinaryWithoutLength() throws Exception
jg.close();
}

public void testStreamingBinaryPartly() throws Exception {
_testStreamingBinaryPartly(true);
_testStreamingBinaryPartly(false);
}

private void _testStreamingBinaryPartly(boolean rawBinary) throws Exception
{
final SmileFactory f = new SmileFactory();
f.configure(Feature.ENCODE_BINARY_AS_7BIT, rawBinary);

final byte[] INPUT = TEXT4.getBytes("UTF-8");
ByteArrayInputStream in = new ByteArrayInputStream(INPUT);

ByteArrayOutputStream out = new ByteArrayOutputStream();
JsonGenerator jg = f.createGenerator(out);
jg.writeStartArray();
jg.writeBinary(in, 1);
jg.writeEndArray();
jg.close();
in.close();

JsonParser jp = f.createParser(out.toByteArray());
assertToken(JsonToken.START_ARRAY, jp.nextToken());
assertToken(JsonToken.VALUE_EMBEDDED_OBJECT, jp.nextToken());
byte[] b = jp.getBinaryValue();
assertToken(JsonToken.END_ARRAY, jp.nextToken());
jp.close();

assertEquals(1, b.length);
}

/*
/**********************************************************
/* Helper methods
Expand Down