Merge branch 'master' of https://github.com/google/flatbuffers

java/com/google/flatbuffers/FlatBufferBuilder.java

@@ -368,7 +368,8 @@ public class FlatBufferBuilder {
     /// @endcond
 
    /**
-    * Encode the string `s` in the buffer using UTF-8.
+    * Encode the string `s` in the buffer using UTF-8.  If {@code s} is
+    * already a {@link CharBuffer}, this method is allocation free.
     *
     * @param s The string to encode.
     * @return The offset in the buffer where the encoded string starts.
@@ -382,7 +383,8 @@ public class FlatBufferBuilder {
 
         dst.clear();
 
-        CharBuffer src = CharBuffer.wrap(s);
+        CharBuffer src = s instanceof CharBuffer ? (CharBuffer) s :
+            CharBuffer.wrap(s);
         CoderResult result = encoder.encode(src, dst, true);
         if (result.isError()) {
             try {