BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-07 05:47:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made reading read-only ByteBuffers work.

Browse Source 
Also added new constructor that allows ByteBuffer reuse.

Change-Id: I9c20ea96c67533066461f4e23b0d03b9b47cd068
Tested: on OS X.
This commit is contained in:
Wouter van Oortmerssen
2014-09-02 18:35:20 -07:00
parent 8e40902d52
commit 4507594812
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/flatbuffers/FlatBufferBuilder.java
View File

@@ -30,7 +30,7 @@ public class FlatBufferBuilder {
int space; // Remaining space in the ByteBuffer.
static final Charset utf8charset = Charset.forName("UTF-8");
int minalign = 1; // Minimum alignment encountered so far.
int[] vtable; // The vtable for the current table, null otherwise.
int[] vtable = null; // The vtable for the current table, null otherwise.
int object_start; // Starting offset of the current struct/table.
int[] vtables = new int[16]; // List of offsets of all vtables.
int num_vtables = 0; // Number of entries in `vtables` in use.
@@ -47,6 +47,14 @@ public class FlatBufferBuilder {
bb = newByteBuffer(new byte[initial_size]);
}
// Alternative constructor allowing reuse of ByteBuffers
public FlatBufferBuilder(ByteBuffer existing_bb) {
bb = existing_bb;
bb.clear();
bb.order(ByteOrder.LITTLE_ENDIAN);
space = bb.capacity();
}
ByteBuffer newByteBuffer(byte[] buf) {
ByteBuffer newbb = ByteBuffer.wrap(buf);
newbb.order(ByteOrder.LITTLE_ENDIAN);

12
java/flatbuffers/Table.java
View File

@@ -42,7 +42,17 @@ public class Table {
// Create a java String from UTF-8 data stored inside the flatbuffer.
protected String __string(int offset) {
offset += bb.getInt(offset);
return new String(bb.array(), offset + SIZEOF_INT, bb.getInt(offset), Charset.forName("UTF-8"));
if (bb.hasArray()) {
return new String(bb.array(), offset + SIZEOF_INT, bb.getInt(offset), Charset.forName("UTF-8"));
} else {
// We can't access .array(), since the ByteBuffer is read-only.
// We're forced to make an extra copy:
bb.position(offset + SIZEOF_INT);
byte[] copy = new byte[bb.getInt(offset)];
bb.get(copy);
bb.position(0);
return new String(copy, 0, copy.length, Charset.forName("UTF-8"));
}
}
// Get the length of a vector whose offset is stored at "offset" in this object.