From: Jani Laakso <jani.laakso@itmill.com>
Date: Tue, 15 May 2007 16:32:13 +0000 (+0000)
Subject: Partial fix for #723 (Memory leak), Applications are still not GC'ed.
X-Git-Tag: 6.7.0.beta1~6389
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4b5b21c19c530f1b5ced9c837b38de3dfed88309;p=vaadin-framework.git

Partial fix for #723 (Memory leak), Applications are still not GC'ed.

svn changeset:1437/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index 261a803f09..b3daf46733 100644
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -44,7 +44,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -221,9 +220,9 @@ public class ApplicationServlet extends HttpServlet implements
 
 	private WeakHashMap applicationToAjaxAppMgrMap = new WeakHashMap();
 
-	private HashMap licenseForApplicationClass = new HashMap();
+	private WeakHashMap licenseForApplicationClass = new WeakHashMap();
 
-	private static HashSet licensePrintedForApplicationClass = new HashSet();
+	private static WeakHashMap licensePrintedForApplicationClass = new WeakHashMap();
 
 	/**
 	 * Called by the servlet container to indicate to a servlet that the servlet
@@ -1507,8 +1506,9 @@ public class ApplicationServlet extends HttpServlet implements
 		}
 
 		// For each application class, print license description - once
-		if (!licensePrintedForApplicationClass.contains(applicationClass)) {
-			licensePrintedForApplicationClass.add(applicationClass);
+		if (!licensePrintedForApplicationClass.containsKey(applicationClass)) {
+			licensePrintedForApplicationClass.put(applicationClass,
+					Boolean.TRUE);
 			if (license.shouldLimitsBePrintedOnInit())
 				System.out.print(license.getDescription());
 		}
@@ -2138,4 +2138,4 @@ public class ApplicationServlet extends HttpServlet implements
 		return resultPath;
 	}
 
-}
+}
\ No newline at end of file