From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 12 Nov 2009 14:13:06 +0000 (+0000)
Subject: Merged Fix for #3702 - "ApplicationRunnerServlet:getApplicationRunnerURIs occasionall... 
X-Git-Tag: 6.7.0.beta1~2307
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5243384dd6430062a8eb6ed7f812be0de0fd287b;p=vaadin-framework.git

Merged Fix for #3702 - "ApplicationRunnerServlet:getApplicationRunnerURIs occasionally throws NPE" from 6.1

svn changeset:9749/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
index 896d4e651c..aeb1b50c9c 100644
--- a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
@@ -19,7 +19,7 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
      * request.
      */
     private String[] defaultPackages;
-    private HttpServletRequest request;
+    private ThreadLocal<HttpServletRequest> request = new ThreadLocal<HttpServletRequest>();
 
     @Override
     public void init(ServletConfig servletConfig) throws ServletException {
@@ -34,9 +34,9 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
     @Override
     protected void service(HttpServletRequest request,
             HttpServletResponse response) throws ServletException, IOException {
-        this.request = request;
+        this.request.set(request);
         super.service(request, response);
-        this.request = null;
+        this.request.set(null);
     }
 
     @Override
@@ -150,7 +150,8 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
 
         Class<? extends Application> appClass = null;
 
-        String baseName = getApplicationRunnerApplicationClassName(request);
+        String baseName = getApplicationRunnerApplicationClassName(request
+                .get());
         try {
             appClass = (Class<? extends Application>) getClass()
                     .getClassLoader().loadClass(baseName);