From e739eeabf915b5e3b0d607532f703018ce9583a9 Mon Sep 17 00:00:00 2001
From: ZHANG Dapeng <zdapeng@google.com>
Date: Wed, 18 Mar 2020 16:07:20 -0700
Subject: [PATCH] core: fix java.nio.ByteBuffer Java 9+ incompatible usage

---
 .../grpc/internal/CompositeReadableBuffer.java |  9 ++++++---
 .../java/io/grpc/internal/ReadableBuffers.java | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/io/grpc/internal/CompositeReadableBuffer.java b/core/src/main/java/io/grpc/internal/CompositeReadableBuffer.java
index d35bf05cf9..9a9bf5c926 100644
--- a/core/src/main/java/io/grpc/internal/CompositeReadableBuffer.java
+++ b/core/src/main/java/io/grpc/internal/CompositeReadableBuffer.java
@@ -18,6 +18,7 @@ package io.grpc.internal;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.util.ArrayDeque;
 import java.util.Queue;
@@ -101,16 +102,18 @@ public class CompositeReadableBuffer extends AbstractReadableBuffer {
 
   @Override
   public void readBytes(final ByteBuffer dest) {
+    // Use Buffer instead of ByteBuffer for JDK 9+ compatibility.
+    final Buffer destAsBuffer = dest;
     execute(new ReadOperation() {
       @Override
       public int readInternal(ReadableBuffer buffer, int length) {
         // Change the limit so that only lengthToCopy bytes are available.
-        int prevLimit = dest.limit();
-        dest.limit(dest.position() + length);
+        int prevLimit = destAsBuffer.limit();
+        destAsBuffer.limit(destAsBuffer.position() + length);
 
         // Write the bytes and restore the original limit.
         buffer.readBytes(dest);
-        dest.limit(prevLimit);
+        destAsBuffer.limit(prevLimit);
         return 0;
       }
     }, dest.remaining());
diff --git a/core/src/main/java/io/grpc/internal/ReadableBuffers.java b/core/src/main/java/io/grpc/internal/ReadableBuffers.java
index 4f65ff1434..34805420fa 100644
--- a/core/src/main/java/io/grpc/internal/ReadableBuffers.java
+++ b/core/src/main/java/io/grpc/internal/ReadableBuffers.java
@@ -23,6 +23,7 @@ import io.grpc.KnownLength;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
@@ -209,7 +210,8 @@ public final class ReadableBuffers {
    * A {@link ReadableBuffer} that is backed by a {@link ByteBuffer}.
    */
   private static class ByteReadableBufferWrapper extends AbstractReadableBuffer {
-    final ByteBuffer bytes;
+    // Use Buffer instead of ByteBuffer for JDK 9+ compatibility.
+    final Buffer bytes;
 
     ByteReadableBufferWrapper(ByteBuffer bytes) {
       this.bytes = Preconditions.checkNotNull(bytes, "bytes");
@@ -223,7 +225,7 @@ public final class ReadableBuffers {
     @Override
     public int readUnsignedByte() {
       checkReadable(1);
-      return bytes.get() & 0xFF;
+      return ((ByteBuffer) bytes).get() & 0xFF;
     }
 
     @Override
@@ -235,7 +237,7 @@ public final class ReadableBuffers {
     @Override
     public void readBytes(byte[] dest, int destOffset, int length) {
       checkReadable(length);
-      bytes.get(dest, destOffset, length);
+      ((ByteBuffer) bytes).get(dest, destOffset, length);
     }
 
     @Override
@@ -249,7 +251,7 @@ public final class ReadableBuffers {
       bytes.limit(bytes.position() + length);
 
       // Write the bytes and restore the original limit.
-      dest.put(bytes);
+      dest.put((ByteBuffer) bytes);
       bytes.limit(prevLimit);
     }
 
@@ -262,7 +264,7 @@ public final class ReadableBuffers {
       } else {
         // The buffer doesn't support array(). Copy the data to an intermediate buffer.
         byte[] array = new byte[length];
-        bytes.get(array);
+        ((ByteBuffer) bytes).get(array);
         dest.write(array);
       }
     }
@@ -270,8 +272,8 @@ public final class ReadableBuffers {
     @Override
     public ByteReadableBufferWrapper readBytes(int length) {
       checkReadable(length);
-      ByteBuffer buffer = bytes.duplicate();
-      buffer.limit(bytes.position() + length);
+      ByteBuffer buffer = ((ByteBuffer) bytes).duplicate();
+      ((Buffer) buffer).limit(bytes.position() + length);
       bytes.position(bytes.position() + length);
       return new ByteReadableBufferWrapper(buffer);
     }
@@ -283,7 +285,7 @@ public final class ReadableBuffers {
 
     @Override
     public byte[] array() {
-      return bytes.array();
+      return ((ByteBuffer) bytes).array();
     }
 
     @Override