From 40ce672aa404564acd812287ef56786326a7c4ca Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Fri, 6 Jan 2012 12:22:06 +0200
Subject: [PATCH] Ensure the ThreadLocal request is cleared even if an
 exception is thrown

---
 .../terminal/gwt/server/ApplicationRunnerServlet.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
index e41ea2a980..1fa569fa85 100644
--- a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
@@ -62,8 +62,11 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
     protected void service(HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException {
         this.request.set(request);
-        super.service(request, response);
-        this.request.set(null);
+        try {
+            super.service(request, response);
+        } finally {
+            this.request.set(null);
+        }
     }
 
     @Override
-- 
2.39.5