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

Move pendingDeadline.cancel out of synchronized block

This commit is contained in:
Kristofer Karlsson 2021-02-17 14:42:57 +01:00 committed by Eric Anderson
parent e73f31a561
commit 3c4d3d2bb2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
context/src/main/java/io/grpc/Context.java
View File

@ -826,18 +826,22 @@ public class Context {
@CanIgnoreReturnValue @CanIgnoreReturnValue
public boolean cancel(Throwable cause) { public boolean cancel(Throwable cause) {
boolean triggeredCancel = false; boolean triggeredCancel = false;
ScheduledFuture<?> localPendingDeadline = null;
synchronized (this) { synchronized (this) {
if (!cancelled) { if (!cancelled) {
cancelled = true; cancelled = true;
if (pendingDeadline != null) { if (pendingDeadline != null) {
// If we have a scheduled cancellation pending attempt to cancel it. // If we have a scheduled cancellation pending attempt to cancel it.
pendingDeadline.cancel(false); localPendingDeadline = pendingDeadline;
pendingDeadline = null; pendingDeadline = null;
} }
this.cancellationCause = cause; this.cancellationCause = cause;
triggeredCancel = true; triggeredCancel = true;
} }
} }
if (localPendingDeadline != null) {
localPendingDeadline.cancel(false);
}
if (triggeredCancel) { if (triggeredCancel) {
notifyAndClearListeners(); notifyAndClearListeners();
} }