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

Fix synchronization in client auth 

The synchronization was simply using the wrong object, so no
synchronization was actually occurring. In addition, reference of cached
outside of synchronized block could permit using a partially constructed
cached object, as the reference may be set before instantiation
completes.
This commit is contained in:
Eric Anderson 2015-03-26 07:35:07 -07:00
parent e515c772cd
commit b48b4db3fb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
auth/src/main/java/io/grpc/auth/ClientAuthInterceptor.java
View File

@ -74,7 +74,8 @@ public class ClientAuthInterceptor implements ClientInterceptor {
@Override
public void start(Listener<RespT> responseListener, Metadata.Headers headers) {
try {
synchronized (this) {
Metadata.Headers cachedSaved;
synchronized (ClientAuthInterceptor.this) {
// TODO(lryan): This is icky but the current auth library stores the same
// metadata map until the next refresh cycle. This will be fixed once
// https://github.com/google/google-auth-library-java/issues/3
@ -83,8 +84,9 @@ public class ClientAuthInterceptor implements ClientInterceptor {
lastMetadata = credentials.getRequestMetadata();
cached = toHeaders(lastMetadata);
}
cachedSaved = cached;
}
headers.merge(cached);
headers.merge(cachedSaved);
super.start(responseListener, headers);
} catch (IOException ioe) {
responseListener.onClose(Status.fromThrowable(ioe), new Metadata.Trailers());
@ -105,4 +107,4 @@ public class ClientAuthInterceptor implements ClientInterceptor {
}
return headers;
}
}
}