okHttp: Removed Annotation @SuppressWarnings("GuardedBy")

grpc · Oct 18, 2024 · 8cbadd9 · 8cbadd9
1 parent ae2865a
commit 8cbadd9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java
@@ -356,7 +356,7 @@ private void onEndOfStream() {
     //@SuppressWarnings("GuardedBy")
     @GuardedBy("lock")
     private void cancel(Status reason, boolean stopDelivery, Metadata trailers) {
-      synchronized (transport.lock) {
+      synchronized (OkHttpClientTransport.lock) {
         if (cancelSent) {
           return;
         }
@@ -402,7 +402,7 @@ private void sendBuffer(Buffer buffer, boolean endOfStream, boolean flush) {
     //@SuppressWarnings("GuardedBy")
     @GuardedBy("lock")
     private void streamReady(Metadata metadata, String path) {
-      synchronized (transport.lock) {
+      synchronized (OkHttpClientTransport.lock) {
         requestHeaders =
             Headers.createRequestHeaders(
                 metadata,

diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
@@ -156,7 +156,7 @@ private static Map<ErrorCode, Status> buildErrorCodeToStatusMap() {
   @GuardedBy("lock")
   private ExceptionHandlingFrameWriter frameWriter;
   private OutboundFlowController outboundFlow;
-  final Object lock = new Object();
+  static Object lock = new Object();
   private final InternalLogId logId;
   @GuardedBy("lock")
   private int nextStreamId;
@@ -1230,7 +1230,8 @@ public void data(boolean inFinished, int streamId, BufferedSource in, int length
     /**
      * Handle HTTP2 HEADER and CONTINUATION frames.
      */
-    @SuppressWarnings("GuardedBy")
+    //@SuppressWarnings("GuardedBy")
+    @GuardedBy("lock")
     @Override
     public void headers(boolean outFinished,
         boolean inFinished,
@@ -1253,15 +1254,19 @@ public void headers(boolean outFinished,
                   metadataSize));
         }
       }
-      synchronized (lock) {
-        OkHttpClientStream stream = streams.get(streamId);
+      OkHttpClientStream stream;
+      synchronized (OkHttpClientTransport.lock) {
+        stream = streams.get(streamId);
         if (stream == null) {
           if (mayHaveCreatedStream(streamId)) {
             frameWriter.rstStream(streamId, ErrorCode.STREAM_CLOSED);
           } else {
             unknownStream = true;
           }
-        } else {
+        }
+      }
+      if (stream != null) {
+        synchronized (stream.transportState().lock) {
           if (failedStatus == null) {
             PerfMark.event("OkHttpClientTransport$ClientFrameHandler.headers",
                 stream.transportState().tag());