From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Mon, 11 Feb 2008 21:29:17 +0000 (+0000)
Subject: Removed unneeded ApplicationServlet reference from CommunicationManager as proposed... 
X-Git-Tag: 6.7.0.beta1~5060
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=89a6534a5434c050059e66b73597fcdc75c4abe2;p=vaadin-framework.git

Removed unneeded ApplicationServlet reference from CommunicationManager as proposed by Kai Virkki in order to make CommunicationManager runnable in Terracotta.

svn changeset:3771/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index fa07c67e7f..e0771ee98b 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -382,7 +382,7 @@ public class ApplicationServlet extends HttpServlet {
                     ((WebApplicationContext) application.getContext())
                             .startTransaction(application, request);
                     getApplicationManager(application).handleUidlRequest(
-                            request, response);
+                            request, response, this);
 
                     return;
                 }
@@ -1407,7 +1407,7 @@ public class ApplicationServlet extends HttpServlet {
 
         if (mgr == null) {
             // Creates new manager
-            mgr = new CommunicationManager(application, this);
+            mgr = new CommunicationManager(application);
             applicationToAjaxAppMgrMap.put(application, mgr);
         }
         return mgr;
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
index cf65346237..bafa214aaf 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
@@ -87,12 +87,8 @@ public class CommunicationManager implements Paintable.RepaintRequestListener {
 
     private int pendingLocalesIndex;
 
-    private final ApplicationServlet applicationServlet;
-
-    public CommunicationManager(Application application,
-            ApplicationServlet applicationServlet) {
+        public CommunicationManager(Application application) {
         this.application = application;
-        this.applicationServlet = applicationServlet;
         requireLocale(application.getLocale().toString());
     }
 
@@ -190,7 +186,7 @@ public class CommunicationManager implements Paintable.RepaintRequestListener {
      * @throws IOException
      */
     public void handleUidlRequest(HttpServletRequest request,
-            HttpServletResponse response) throws IOException {
+            HttpServletResponse response, ApplicationServlet applicationServlet) throws IOException {
 
         // repaint requested or session has timed out and new one is created
         boolean repaintAll = (request.getParameter(GET_PARAM_REPAINT_ALL) != null)