svn commit: r730177 - in /lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2: DelegatingSiteTree.java SiteTreeFactory.java

Author: andreas
Date: Tue Dec 30 08:51:01 2008
New Revision: 730177

URL: http://svn.apache.org/viewvc?rev=730177&view=rev
Log:
Use session instead of shared item store to build delegating sitetree nodes to avoid having multiple sessions in the delegating site tree, which causes a memory leak.

Modified:
    lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/DelegatingSiteTree.java
    lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java

Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/DelegatingSiteTree.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/DelegatingSiteTree.java?rev=730177&r1=730176&r2=730177&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/DelegatingSiteTree.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/DelegatingSiteTree.java Tue Dec 30 08:51:01 2008
@@ -52,7 +52,7 @@
     private List topLevelNodes;
     private List preOrder;
     private String sourceUri;
-    private SharedItemStore store;
+    private Session session;
     private String key;
     private SiteTreeFactory factory;
 
@@ -64,10 +64,10 @@
      * @param key The key to build the sitetree.
      */
     public DelegatingSiteTree(ServiceManager manager, Area area, SiteTreeFactory factory,
-            SharedItemStore store, String key) {
+            Session session, String key) {
         this.area = area;
         this.manager = manager;
-        this.store = store;
+        this.session = session;
         this.key = key;
         this.factory = factory;
     }
@@ -211,7 +211,7 @@
 
     protected SiteTree getTree() {
         try {
-            return (SiteTree) this.store.getRepositoryItem(this.factory, this.key);
+            return (SiteTree) this.session.getRepositoryItem(this.factory, this.key);
         } catch (RepositoryException e) {
             throw new RuntimeException(e);
         }

Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java?rev=730177&r1=730176&r2=730177&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/SiteTreeFactory.java Tue Dec 30 08:51:01 2008
@@ -66,7 +66,7 @@
             if (session.isModifiable() || session == store.getSession()) {
                 tree = new SiteTreeImpl(this.manager, area, getLogger());
             } else {
-                tree = new DelegatingSiteTree(this.manager, area, this, store, key);
+                tree = new DelegatingSiteTree(this.manager, area, this, store.getSession(), key);
             }
         } catch (Exception e) {
             throw new RepositoryException(e);