Skip to content
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

Do not rewind position when serializing direct ByteBuffer #4164

Merged
merged 2 commits into from
Oct 17, 2023
Merged

Do not rewind position when serializing direct ByteBuffer #4164

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
5dfd9c4
Consider position when serializing direct ByteBuffer
yawkat Oct 17, 2023
92f5811
fix comment
yawkat Oct 17, 2023
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
5 changes: 1 addition & 4 deletions src/main/java/com/fasterxml/jackson/databind/ser/std/ByteBufferSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,8 @@ public void serialize(ByteBuffer bbuf, JsonGenerator gen, SerializerProvider pro
return;
}
// the other case is more complicated however. Best to handle with InputStream wrapper.
// But should we rewind it; and/or make a copy?
// Prior to jackson-databind#4164 we rewound here, but that didn't match heap buffer behavior.
ByteBuffer copy = bbuf.asReadOnlyBuffer();
if (copy.position() > 0) {
copy.rewind();
}
InputStream in = new ByteBufferBackedInputStream(copy);
gen.writeBinary(in, copy.remaining());
in.close();
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/com/fasterxml/jackson/databind/ser/jdk/JDKTypeSerializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ public void testByteBuffer() throws IOException
// so far so good, but must ensure Native buffers also work:
ByteBuffer bbuf2 = ByteBuffer.allocateDirect(5);
bbuf2.put(INPUT_BYTES);
bbuf2.flip();
assertEquals(exp, MAPPER.writeValueAsString(bbuf2));
}

Expand Down Expand Up @@ -182,6 +183,18 @@ public void testDuplicatedByteBufferWithCustomPosition() throws IOException
assertEquals(exp, MAPPER.writeValueAsString(bbuf.duplicate()));
}

public void testDuplicatedByteBufferWithCustomPositionDirect() throws IOException
{
final byte[] INPUT_BYTES = new byte[] { 1, 2, 3, 4, 5 };

String exp = MAPPER.writeValueAsString(new byte[] { 3, 4, 5 });
ByteBuffer bbuf = ByteBuffer.allocateDirect(INPUT_BYTES.length);
bbuf.put(INPUT_BYTES);
bbuf.position(2);
ByteBuffer duplicated = bbuf.duplicate();
assertEquals(exp, MAPPER.writeValueAsString(duplicated));
}

// [databind#2197]
public void testVoidSerialization() throws Exception
{
Expand Down