refactoring: use CurrentInstace to preserve current UI

vaadin · Nov 28, 2023 · 5e6d203 · 5e6d203
1 parent 0a42d41
commit 5e6d203
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/component/UI.java b/flow-server/src/main/java/com/vaadin/flow/component/UI.java
@@ -571,12 +571,13 @@ public void handleError(Exception exception) {
                         ErrorHandlingCommand errorHandlingCommand = (ErrorHandlingCommand) command;
                         errorHandlingCommand.handleError(exception);
                     } else if (getSession() != null) {
-                        UI.setCurrent(UI.this);
+                        final Map<Class<?>, CurrentInstance> map = CurrentInstance
+                                .setCurrent(UI.this);
                         try {
                             getSession().getErrorHandler()
                                     .error(new ErrorEvent(exception));
                         } finally {
-                            UI.setCurrent(null);
+                            CurrentInstance.restoreInstances(map);
                         }
                     } else {
                         /*