upgrade grpc to 1.50.2

sofastack · Nov 17, 2022 · 0d70da5 · 0d70da5
1 parent 3a1bdcf
commit 0d70da5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/jraft-extension/rpc-grpc-impl/pom.xml b/jraft-extension/rpc-grpc-impl/pom.xml
@@ -11,7 +11,7 @@
  <name>jraft-extension ${project.version}</name>
 
  <properties>
- <io.grpc.version>1.17.0</io.grpc.version>
+ <io.grpc.version>1.50.2</io.grpc.version>
  </properties>
 
  <dependencies>

diff --git a/...rpc-grpc-impl/src/main/java/io/grpc/netty/shaded/io/grpc/netty/NettyConnectionHelper.java b/...rpc-grpc-impl/src/main/java/io/grpc/netty/shaded/io/grpc/netty/NettyConnectionHelper.java
@@ -35,18 +35,23 @@
  */
 public class NettyConnectionHelper {
 
- private static final ReferenceFieldUpdater<NettyServerStream, Channel> CHANNEL_GETTER = Updaters
+ private static final ReferenceFieldUpdater<NettyServerStream, WriteQueue> WRITE_QUEUE_GETTER = Updaters
  .newReferenceFieldUpdater(
  NettyServerStream.class,
- "channel");
+ "writeQueue");
+
+ private static final ReferenceFieldUpdater<WriteQueue, Channel> CHANNEL_GETTER = Updaters
+ .newReferenceFieldUpdater(
+ WriteQueue.class,
+ "channel");
 
  private static final AttributeKey<NettyConnection> NETTY_CONN_KEY = AttributeKey
  .valueOf("netty.conn");
 
  public static Connection getOrCreateConnection(final ServerStream stream,
  final List<ConnectionClosedEventListener> listeners) {
  if (stream instanceof NettyServerStream) {
- return attachChannel(CHANNEL_GETTER.get((NettyServerStream) stream), listeners);
+ return attachChannel(CHANNEL_GETTER.get(WRITE_QUEUE_GETTER.get((NettyServerStream) stream)), listeners);
  }
  return null;
  }