Send beforeClientResponse exceptions to an error handler (#14214)

Change-Id: Ib0cd9a402bbef0c7adb65bd8298a71b5521edd7c

2 files changed, 9 insertions, 7 deletions

diff --git a/server/src/com/vaadin/server/LegacyCommunicationManager.java b/server/src/com/vaadin/server/LegacyCommunicationManager.java
index fda5ad444f..e982cdf10a 100644
--- a/server/src/com/vaadin/server/LegacyCommunicationManager.java
+++ b/server/src/com/vaadin/server/LegacyCommunicationManager.java
@@ -388,17 +388,15 @@ public class LegacyCommunicationManager implements Serializable {
     }
 
     /**
-     * Handles an exception that occurred when processing RPC calls or a file
-     * upload.
+     * Handles an exception related to a connector by invoking the appropriate
+     * error handler.
      * 
      * @deprecated As of 7.1. See #11411.
      * 
-     * @param ui
-     *            The UI where the exception occured
      * @param throwable
-     *            The exception
+     *            the exception to handle
      * @param connector
-     *            The Rpc target
+     *            the connector that the exception is related to
      */
     @Deprecated
     public void handleConnectorRelatedException(ClientConnector connector,
diff --git a/server/src/com/vaadin/server/communication/UidlWriter.java b/server/src/com/vaadin/server/communication/UidlWriter.java
index 00a65d3877..a4797e49aa 100644
--- a/server/src/com/vaadin/server/communication/UidlWriter.java
+++ b/server/src/com/vaadin/server/communication/UidlWriter.java
@@ -109,7 +109,11 @@ public class UidlWriter implements Serializable {
                         .isClientSideInitialized(connector);
                 processedConnectors.add(connector);
 
-                connector.beforeClientResponse(!initialized);
+                try {
+                    connector.beforeClientResponse(!initialized);
+                } catch (RuntimeException e) {
+                    manager.handleConnectorRelatedException(connector, e);
+                }
             }
         }