Author: bpapez
Date: Wed Jan 9 00:23:06 2008
New Revision: 19477
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19477&repname=
=3Djahia
Log:
MAN-30: Use soft references in the internal SiteMapViewHelper caching
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/sitemap/JahiaSite=
MapService.java
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/sitemap/Jah=
iaSiteMapService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/sitemap/JahiaSiteMapService.java&rev=3D194=
77&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/sitemap/JahiaSite=
MapService.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/sitemap/JahiaSite=
MapService.java Wed Jan 9 00:23:06 2008
@@ -55,9 +55,11 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
=
+import org.apache.commons.collections.map.ReferenceMap;
import org.jahia.data.fields.JahiaField;
import org.jahia.data.fields.JahiaFieldDefinitionProperties;
import org.jahia.data.viewhelper.sitemap.FlatSiteMapViewHelper;
@@ -87,8 +89,6 @@
*/
public class JahiaSiteMapService extends JahiaInitializableService {
=
- private boolean cacheSiteMap =3D true;
-
/**
* The pages filter parameter =
*/
@@ -229,9 +229,7 @@
pageInfosFlag + "' and language code '" + lan=
guageCode + "'";
logger.debug(message);
siteMapViewHelper =3D new TreeSiteMapViewHelper(user, pages, p=
ageInfosFlag, languageCode, defaultMaxLevel, directPageOnly, pagesFilter, j=
Params);
- if ( cacheSiteMap ){
- _treeSiteMapViewHelper.put(context, siteMapViewHelper);
- }
+ _treeSiteMapViewHelper.put(context, siteMapViewHelper);
}
return siteMapViewHelper;
}
@@ -569,14 +567,14 @@
=
static private JahiaSiteMapService singletonInstance =3D null;
// Store the tree site map view helper for a given context.
- private HashMap _treeSiteMapViewHelper =3D new HashMap();
+ private Map _treeSiteMapViewHelper =3D new ReferenceMap();
// Store the flat site map view helper for a given context.
- private HashMap _flatSiteMapViewHelper =3D new HashMap();
+ private Map _flatSiteMapViewHelper =3D new ReferenceMap();
// Store the parameters key corresponding to method pointers
- private HashMap _siteMapMethods =3D new HashMap();
+ private Map _siteMapMethods =3D new HashMap();
// To avoid a long URL parameter this hash map store the match between=
the
// site map view helper method to call and a parameter.
- private HashMap _urlParams =3D new HashMap();
+ private Map _urlParams =3D new HashMap();
=
private static org.apache.log4j.Logger logger =3D
org.apache.log4j.Logger.getLogger(JahiaSiteMapService.class);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
