From bc3e4e9a85d62e287899899e5b7bfee7416435db Mon Sep 17 00:00:00 2001
From: ZHANG Dapeng <zdapeng@google.com>
Date: Thu, 8 Feb 2018 14:29:59 -0800
Subject: [PATCH] core: Remove incorrect `@GuardedBy` annotations

This change is being made in preparation for fixing a bug in the enforcement
of `@guardedby`.

Non-static inner classes can refer to locks declared by their enclosing
instances. Static member types (static classes, interfaces) cannot.
---
 core/src/main/java/io/grpc/internal/RetriableStream.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/io/grpc/internal/RetriableStream.java b/core/src/main/java/io/grpc/internal/RetriableStream.java
index ddae057cdb..cfbb41653d 100644
--- a/core/src/main/java/io/grpc/internal/RetriableStream.java
+++ b/core/src/main/java/io/grpc/internal/RetriableStream.java
@@ -679,14 +679,14 @@ abstract class RetriableStream<ReqT> implements ClientStream {
     }
 
     @CheckReturnValue
-    @GuardedBy("lock")
+    // GuardedBy RetriableStream.lock
     State cancelled() {
       return new State(buffer, drainedSubstreams, winningSubstream, true, passThrough);
     }
 
     /** The given substream is drained. */
     @CheckReturnValue
-    @GuardedBy("lock")
+    // GuardedBy RetriableStream.lock
     State substreamDrained(Substream substream) {
       checkState(!passThrough, "Already passThrough");
 
@@ -710,7 +710,7 @@ abstract class RetriableStream<ReqT> implements ClientStream {
 
     /** The given substream is closed. */
     @CheckReturnValue
-    @GuardedBy("lock")
+    // GuardedBy RetriableStream.lock
     State substreamClosed(Substream substream) {
       substream.closed = true;
       if (this.drainedSubstreams.contains(substream)) {
@@ -723,7 +723,7 @@ abstract class RetriableStream<ReqT> implements ClientStream {
     }
 
     @CheckReturnValue
-    @GuardedBy("lock")
+    // GuardedBy RetriableStream.lock
     State committed(Substream winningSubstream) {
       checkState(this.winningSubstream == null, "Already committed");