From: Marc Englund <marc.englund@itmill.com>
Date: Fri, 11 Apr 2008 14:07:07 +0000 (+0000)
Subject: Modified to suit portal integration.
X-Git-Tag: 6.7.0.beta1~4904
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=07e836f62f9cba5f29d8a58693da5e631acb2fc7;p=vaadin-framework.git

Modified to suit portal integration.

svn changeset:4163/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java b/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java
index c12f9e652a..79eae4b484 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java
@@ -33,22 +33,20 @@ import com.itmill.toolkit.service.ApplicationContext;
 public class WebApplicationContext implements ApplicationContext,
         HttpSessionBindingListener {
 
-    private List listeners;
+    protected List listeners;
 
-    private final HttpSession session;
+    protected HttpSession session;
 
-    private final HashSet applications = new HashSet();
+    protected final HashSet applications = new HashSet();
 
-    private final WebBrowser browser = new WebBrowser();
+    protected WebBrowser browser = new WebBrowser();
 
     /**
      * Creates a new Web Application Context.
      * 
-     * @param session
-     *                the HTTP session.
      */
-    WebApplicationContext(HttpSession session) {
-        this.session = session;
+    WebApplicationContext() {
+
     }
 
     /**
@@ -95,9 +93,12 @@ public class WebApplicationContext implements ApplicationContext,
         WebApplicationContext cx = (WebApplicationContext) session
                 .getAttribute(WebApplicationContext.class.getName());
         if (cx == null) {
-            cx = new WebApplicationContext(session);
+            cx = new WebApplicationContext();
             session.setAttribute(WebApplicationContext.class.getName(), cx);
         }
+        if (cx.session == null) {
+            cx.session = session;
+        }
         return cx;
     }