Commit c95ad9cc authored by Patrick Julien's avatar Patrick Julien Committed by Wouter van Oortmerssen

Reuse the same charset instance

Change-Id: I58b411a2c0f1ee6b856d5b1eaa42787036da1384
parent 35508999
...@@ -18,7 +18,6 @@ package com.google.flatbuffers; ...@@ -18,7 +18,6 @@ package com.google.flatbuffers;
import static com.google.flatbuffers.Constants.*; import static com.google.flatbuffers.Constants.*;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.Charset;
// All tables in the generated code derive from this class, and add their own accessors. // All tables in the generated code derive from this class, and add their own accessors.
public class Table { public class Table {
...@@ -45,7 +44,7 @@ public class Table { ...@@ -45,7 +44,7 @@ public class Table {
protected String __string(int offset) { protected String __string(int offset) {
offset += bb.getInt(offset); offset += bb.getInt(offset);
if (bb.hasArray()) { if (bb.hasArray()) {
return new String(bb.array(), offset + SIZEOF_INT, bb.getInt(offset), Charset.forName("UTF-8")); return new String(bb.array(), offset + SIZEOF_INT, bb.getInt(offset), FlatBufferBuilder.utf8charset);
} else { } else {
// We can't access .array(), since the ByteBuffer is read-only. // We can't access .array(), since the ByteBuffer is read-only.
// We're forced to make an extra copy: // We're forced to make an extra copy:
...@@ -54,7 +53,7 @@ public class Table { ...@@ -54,7 +53,7 @@ public class Table {
bb.position(offset + SIZEOF_INT); bb.position(offset + SIZEOF_INT);
bb.get(copy); bb.get(copy);
bb.position(old_pos); bb.position(old_pos);
return new String(copy, 0, copy.length, Charset.forName("UTF-8")); return new String(copy, 0, copy.length, FlatBufferBuilder.utf8charset);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment