aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2014-03-24 15:44:19 +0200
committerJohannes Dahlström <johannesd@vaadin.com>2014-03-27 14:26:42 +0200
commitd4c8b5f404aad5a1f89bd44afa23aa732b21d4e4 (patch)
treee7616915ae9d139740f80589a202c5123469c9d9 /server/src/com/vaadin
parent880bdbd52b1f92057a680928f2ca8898b6fc5145 (diff)
downloadvaadin-framework-d4c8b5f404aad5a1f89bd44afa23aa732b21d4e4.tar.gz
vaadin-framework-d4c8b5f404aad5a1f89bd44afa23aa732b21d4e4.zip
Use the ErrorHandler mechanism in ConnectorResourceHandler (#12269)
Change-Id: I9d608e942380bd53868b65eda180fe9c8477c138
Diffstat (limited to 'server/src/com/vaadin')
-rw-r--r--server/src/com/vaadin/server/ConnectorResourceHandler.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/server/src/com/vaadin/server/ConnectorResourceHandler.java b/server/src/com/vaadin/server/ConnectorResourceHandler.java
index 3f3f41a179..e4315e9694 100644
--- a/server/src/com/vaadin/server/ConnectorResourceHandler.java
+++ b/server/src/com/vaadin/server/ConnectorResourceHandler.java
@@ -87,6 +87,14 @@ public class ConnectorResourceHandler implements RequestHandler {
+ connector.getConnectorId()
+ ") did not handle connector request for " + key);
}
+ } catch (Exception e) {
+ session.lock();
+ try {
+ session.getCommunicationManager()
+ .handleConnectorRelatedException(connector, e);
+ } finally {
+ session.unlock();
+ }
} finally {
CurrentInstance.restoreInstances(oldInstances);
}