From 02cc5217a244173cdeab50e8012ebc2a4b3a2e8b Mon Sep 17 00:00:00 2001 From: nmittler Date: Thu, 22 Jan 2015 12:29:09 -0800 Subject: [PATCH] Fixing @GuardedBy annotation to use the correct lock name. --- .../net/stubby/transport/okhttp/OkHttpClientStream.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientStream.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientStream.java index 59a07c846a..fb91939d90 100644 --- a/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientStream.java +++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientStream.java @@ -63,9 +63,9 @@ class OkHttpClientStream extends Http2ClientStream { return new OkHttpClientStream(listener, frameWriter, transport, outboundFlow); } - @GuardedBy("executorLock") + @GuardedBy("lock") private int window = OkHttpClientTransport.DEFAULT_INITIAL_WINDOW_SIZE; - @GuardedBy("executorLock") + @GuardedBy("lock") private int processedWindow = OkHttpClientTransport.DEFAULT_INITIAL_WINDOW_SIZE; private final AsyncFrameWriter frameWriter; private final OutboundFlowController outboundFlow; @@ -101,7 +101,7 @@ class OkHttpClientStream extends Http2ClientStream { } /** - * We synchronized on "executorLock" for delivering frames and updating window size, so that + * We synchronized on "lock" for delivering frames and updating window size, so that * the future listeners (executed by synchronizedExecutor) will not be executed in the same time. */ public void transportDataReceived(okio.Buffer frame, boolean endOfStream) {