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 261a803f095a7ec465faba63193d3787ed0810a4..b3daf4673371bb5ef79891a000e2ad09c00dcafd 100644 (file)
--- 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