avoiding even more NoSuchMethod exceptions (google#6729)

* avoiding more NoSuchMethod exceptions refs google#6657 * avoiding even more NoSuchMethod exceptions refs google#6657
bjornharrtell · Aug 5, 2021 · 6fb2c90 · 6fb2c90
1 parent a7b527d
commit 6fb2c90
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/java/com/google/flatbuffers/ByteBufferUtil.java b/java/com/google/flatbuffers/ByteBufferUtil.java
@@ -49,9 +49,9 @@ public static int getSizePrefix(ByteBuffer bb) {
      *         size prefix
      */
     public static ByteBuffer removeSizePrefix(ByteBuffer bb) {
-        ByteBuffer s = bb.duplicate();
-        ((Buffer) s).position(s.position() + SIZE_PREFIX_LENGTH);
-        return s;
+        Buffer s = ((Buffer) bb).duplicate();
+        s.position(s.position() + SIZE_PREFIX_LENGTH);
+        return (ByteBuffer) s;
     }
 
 }

diff --git a/java/com/google/flatbuffers/FlatBufferBuilder.java b/java/com/google/flatbuffers/FlatBufferBuilder.java
@@ -1089,10 +1089,10 @@ public byte[] sizedByteArray() {
      */
     public InputStream sizedInputStream() {
         finished();
-        ByteBuffer duplicate = bb.duplicate();
-        ((Buffer) duplicate).position(space);
+        Buffer duplicate = ((Buffer) bb).duplicate();
+        duplicate.position(space);
         duplicate.limit(bb.capacity());
-        return new ByteBufferBackedInputStream(duplicate);
+        return new ByteBufferBackedInputStream((ByteBuffer) duplicate);
     }
 
     /**

diff --git a/java/com/google/flatbuffers/Table.java b/java/com/google/flatbuffers/Table.java
@@ -151,9 +151,9 @@ protected int __vector(int offset) {
   protected ByteBuffer __vector_as_bytebuffer(int vector_offset, int elem_size) {
     int o = __offset(vector_offset);
     if (o == 0) return null;
-    ByteBuffer bb = this.bb.duplicate().order(ByteOrder.LITTLE_ENDIAN);
+    ByteBuffer bb = ((ByteBuffer) (((Buffer) this.bb).duplicate())).order(ByteOrder.LITTLE_ENDIAN);
     int vectorstart = __vector(o);
-    ((Buffer) bb).position(vectorstart);
+    bb.position(vectorstart);
     bb.limit(vectorstart + __vector_len(o) * elem_size);
     return bb;
   }

diff --git a/java/com/google/flatbuffers/Utf8Old.java b/java/com/google/flatbuffers/Utf8Old.java
@@ -87,11 +87,11 @@ public void encodeUtf8(CharSequence in, ByteBuffer out) {
   public String decodeUtf8(ByteBuffer buffer, int offset, int length) {
     CharsetDecoder decoder = CACHE.get().decoder;
     decoder.reset();
-    buffer = buffer.duplicate();
-    ((Buffer) buffer).position(offset);
-    buffer.limit(offset + length);
+    Buffer b = ((Buffer) buffer).duplicate();
+    b.position(offset);
+    b.limit(offset + length);
     try {
-      CharBuffer result = decoder.decode(buffer);
+      CharBuffer result = decoder.decode((ByteBuffer) b);
       return result.toString();
     } catch (CharacterCodingException e) {
       throw new IllegalArgumentException("Bad encoding", e);