Skip to content

fix: Avoid IllegalStateException when resyncing #13727

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

Closed
wants to merge 1 commit into from
Closed

fix: Avoid IllegalStateException when resyncing #13727

Show file tree
Hide file tree
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
19 changes: 11 additions & 8 deletions flow-client/src/main/java/com/vaadin/client/communication/MessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,13 +566,6 @@ private int getExpectedServerId() {
}

private void forceMessageHandling() {
// Clear previous request if it exists. Otherwise resyncrhonize can
// trigger
// "Trying to start a new request while another is active" exception and
// fail.
if (registry.getRequestResponseTracker().hasActiveRequest()) {
registry.getRequestResponseTracker().endRequest();
}
if (!responseHandlingLocks.isEmpty()) {
// Lock which was never release -> bug in locker or things just
// too slow
Expand All @@ -588,7 +581,17 @@ private void forceMessageHandling() {
+ " from the server");

}
if (!handlePendingMessages() && !pendingUIDLMessages.isEmpty()) {
boolean needsResynchronize = !handlePendingMessages()
&& !pendingUIDLMessages.isEmpty();
if (needsResynchronize) {
// Clear previous request if it exists. Otherwise resyncrhonize can
// trigger
// "Trying to start a new request while another is active" exception
// and fail.
if (registry.getRequestResponseTracker().hasActiveRequest()) {
registry.getRequestResponseTracker().endRequest(false);
}

// There are messages but the next id was not found, likely it
// has been lost
// Drop pending messages and resynchronize
Expand Down
7 changes: 6 additions & 1 deletion flow-client/src/main/java/com/vaadin/client/communication/RequestResponseTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ public boolean hasActiveRequest() {
* Fires a {@link ResponseHandlingEndedEvent}.
*/
public void endRequest() {
endRequest(true);
}

public void endRequest(boolean allowFlushPendingInvocations) {
if (!hasActiveRequest) {
throw new IllegalStateException(
"endRequest called when no request is active");
Expand All @@ -109,7 +113,8 @@ public void endRequest() {
hasActiveRequest = false;

if (registry.getUILifecycle().isRunning()
&& registry.getServerRpcQueue().isFlushPending()) {
&& registry.getServerRpcQueue().isFlushPending()
&& allowFlushPendingInvocations) {
// Send the pending RPCs immediately.
// This might be an unnecessary optimization as ServerRpcQueue has a
// finally scheduled command which trigger the send if we do not do
Expand Down