fix: Update UI if custom errorHandler (#17504)

Enable update of UI for beforeClientResponse execution when a custom ErrorHandler is set. Fixes #17352 Co-authored-by: Peter Czuczor <61667986+czp13@users.noreply.github.com>
vaadin · Sep 1, 2023 · fdb88b2 · fdb88b2
1 parent 0a422de
commit fdb88b2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/internal/StateTree.java b/flow-server/src/main/java/com/vaadin/flow/internal/StateTree.java
@@ -33,6 +33,8 @@
 import com.vaadin.flow.function.SerializableConsumer;
 import com.vaadin.flow.internal.change.NodeChange;
 import com.vaadin.flow.internal.nodefeature.NodeFeature;
+import com.vaadin.flow.server.DefaultErrorHandler;
+import com.vaadin.flow.server.ErrorEvent;
 import com.vaadin.flow.server.VaadinSession;
 import com.vaadin.flow.server.communication.UidlWriter;
 import com.vaadin.flow.shared.Registration;
@@ -387,9 +389,20 @@ public void runExecutionsBeforeClientResponse() {
             }
             callbacks.stream().filter(entry -> entry.canExecute(getUI()))
                     .forEach(entry -> {
-                        ExecutionContext context = new ExecutionContext(getUI(),
-                                entry.getStateNode().isClientSideInitialized());
-                        entry.getExecution().accept(context);
+                        try {
+                            ExecutionContext context = new ExecutionContext(
+                                    getUI(), entry.getStateNode()
+                                            .isClientSideInitialized());
+                            entry.getExecution().accept(context);
+                        } catch (Exception e) {
+                            if (getUI().getSession().getErrorHandler()
+                                    .getClass()
+                                    .equals(DefaultErrorHandler.class)) {
+                                throw e;
+                            }
+                            getUI().getSession().getErrorHandler()
+                                    .error(new ErrorEvent(e));
+                        }
                     });
         }
     }

diff --git a/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/ErrorHandlingView.java b/flow-tests/test-root-context/src/main/java/com/vaadin/flow/uitest/ui/ErrorHandlingView.java
@@ -11,6 +11,15 @@ public ErrorHandlingView() {
                     throw new IllegalStateException(
                             "Intentional fail in click handler");
                 }));
+        add(createButton("Throw exception in beforeClientResponse",
+                "clientResponseButton", e -> {
+                    e.getSource().getUI().get().getInternals().getStateTree()
+                            .beforeClientResponse(getElement().getNode(),
+                                    executionContext -> {
+                                        throw new IllegalStateException(
+                                                "Intentional fail in beforeClientResponse");
+                                    });
+                }));
     }
 
 }
diff --git a/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/ErrorHandlingIT.java b/flow-tests/test-root-context/src/test/java/com/vaadin/flow/uitest/ui/ErrorHandlingIT.java
@@ -17,4 +17,15 @@ public void exceptionInClickHandlerDoesNotCauseInternalError() {
                 "An error occurred: java.lang.IllegalStateException: Intentional fail in click handler");
     }
 
+    @Test
+    public void exceptionInBeforeClientResponseDoesNotCauseInternalError() {
+        open();
+        $(NativeButtonElement.class).id("clientResponseButton").click();
+
+        assertNoSystemErrors();
+
+        assertErrorReported(
+                "An error occurred: java.lang.IllegalStateException: Intentional fail in beforeClientResponse");
+    }
+
 }