grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing @GuardedBy annotation to use the correct lock name.

This commit is contained in:
nmittler 2015-01-22 12:29:09 -08:00
parent de3a13164f
commit 02cc5217a2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientStream.java
View File

@ -63,9 +63,9 @@ class OkHttpClientStream extends Http2ClientStream {
return new OkHttpClientStream(listener, frameWriter, transport, outboundFlow); return new OkHttpClientStream(listener, frameWriter, transport, outboundFlow);
} }
@GuardedBy("executorLock") @GuardedBy("lock")
private int window = OkHttpClientTransport.DEFAULT_INITIAL_WINDOW_SIZE; private int window = OkHttpClientTransport.DEFAULT_INITIAL_WINDOW_SIZE;
@GuardedBy("executorLock") @GuardedBy("lock")
private int processedWindow = OkHttpClientTransport.DEFAULT_INITIAL_WINDOW_SIZE; private int processedWindow = OkHttpClientTransport.DEFAULT_INITIAL_WINDOW_SIZE;
private final AsyncFrameWriter frameWriter; private final AsyncFrameWriter frameWriter;
private final OutboundFlowController outboundFlow; 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. * the future listeners (executed by synchronizedExecutor) will not be executed in the same time.
*/ */
public void transportDataReceived(okio.Buffer frame, boolean endOfStream) { public void transportDataReceived(okio.Buffer frame, boolean endOfStream) {