Skip to content

Fix DevTools command completion race #533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OLSander wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −7
Open

Fix DevTools command completion race #533

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions java/org/cef/browser/CefDevToolsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public void onDevToolsMethodResult(
future.completeExceptionally(
new DevToolsException("DevTools method failed", result));
}
removeQueuedCommand(messageId);
}

@Override
Expand All @@ -63,10 +62,6 @@ private CompletableFuture<String> getQueuedCommand(Integer messageId) {
return queuedCommands_.computeIfAbsent(messageId, key -> new CompletableFuture<>());
}

private void removeQueuedCommand(Integer messageId) {
queuedCommands_.remove(messageId);
}

/**
* Execute a method call over the DevTools protocol. See the <a
* href=https://chromedevtools.github.io/devtools-protocol/> DevTools protocol documentation</a>
Expand Down Expand Up @@ -105,8 +100,11 @@ public CompletableFuture<String> executeDevToolsMethod(String method, String par
return future;
}

return browser_.executeDevToolsMethod(method, parametersAsJson)
.thenCompose(this::getQueuedCommand);
return browser_.executeDevToolsMethod(method, parametersAsJson).thenCompose(messageId -> {
CompletableFuture<String> queuedCommand = getQueuedCommand(messageId);
return queuedCommand.whenComplete(
(result, throwable) -> queuedCommands_.remove(messageId, queuedCommand));
});
}

/**
Expand Down