svn commit: r730150 - in /lenya/trunk/src/modules-core: linking/java/src/org/apache/lenya/cms/cocoon/transformation/ metadata/java/src/org/apache/lenya/modules/metadata/ usecase/java/src/org/apache/lenya/cms/cocoon/transformation/

Author: andreas
Date: Tue Dec 30 07:24:33 2008
New Revision: 730150

URL: http://svn.apache.org/viewvc?rev=730150&view=rev
Log:
Recycle pipeline components to avoid dead chunks of memory.

Modified:
    lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/AbstractLinkTransformer.java
    lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/IncomingProxyTransformer.java
    lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/ProxyTransformer.java
    lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UrlToUuidTransformer.java
    lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.java
    lenya/trunk/src/modules-core/metadata/java/src/org/apache/lenya/modules/metadata/MetaDataTransformer.java
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java

Modified: lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/AbstractLinkTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/AbstractLinkTransformer.java?rev=730150&r1=730149&r2=730150&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/AbstractLinkTransformer.java (original)
+++ lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/AbstractLinkTransformer.java Tue Dec 30 07:24:33 2008
@@ -396,4 +396,9 @@
         }
     }
 
+    public void recycle() {
+        super.recycle();
+        this.area = null;
+    }
+
 }

Modified: lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/IncomingProxyTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/IncomingProxyTransformer.java?rev=730150&r1=730149&r2=730150&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/IncomingProxyTransformer.java (original)
+++ lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/IncomingProxyTransformer.java Tue Dec 30 07:24:33 2008
@@ -39,7 +39,7 @@
  * @see IncomingLinkRewriter
  */
 public class IncomingProxyTransformer extends AbstractLinkTransformer {
-
+    
     private LinkRewriter rewriter;
 
     public void setup(SourceResolver _resolver, Map _objectModel, String _source,
@@ -62,4 +62,10 @@
     protected LinkRewriter getLinkRewriter() {
         return this.rewriter;
     }
+    
+    public void recycle() {
+        super.recycle();
+        this.rewriter = null;
+    }
+
 }

Modified: lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/ProxyTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/ProxyTransformer.java?rev=730150&r1=730149&r2=730150&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/ProxyTransformer.java (original)
+++ lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/ProxyTransformer.java Tue Dec 30 07:24:33 2008
@@ -108,4 +108,9 @@
         return this.rewriter;
     }
 
+    public void recycle() {
+        super.recycle();
+        this.rewriter = null;
+    }
+
 }

Modified: lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UrlToUuidTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UrlToUuidTransformer.java?rev=730150&r1=730149&r2=730150&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UrlToUuidTransformer.java (original)
+++ lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UrlToUuidTransformer.java Tue Dec 30 07:24:33 2008
@@ -72,4 +72,9 @@
         return this.rewriter;
     }
 
+    public void recycle() {
+        super.recycle();
+        this.rewriter = null;
+    }
+
 }
\ No newline at end of file

Modified: lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.java?rev=730150&r1=730149&r2=730150&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.java (original)
+++ lenya/trunk/src/modules-core/linking/java/src/org/apache/lenya/cms/cocoon/transformation/UuidToUrlTransformer.java Tue Dec 30 07:24:33 2008
@@ -79,4 +79,9 @@
         return this.rewriter;
     }
 
+    public void recycle() {
+        super.recycle();
+        this.rewriter = null;
+    }
+
 }

Modified: lenya/trunk/src/modules-core/metadata/java/src/org/apache/lenya/modules/metadata/MetaDataTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/metadata/java/src/org/apache/lenya/modules/metadata/MetaDataTransformer.java?rev=730150&r1=730149&r2=730150&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/metadata/java/src/org/apache/lenya/modules/metadata/MetaDataTransformer.java (original)
+++ lenya/trunk/src/modules-core/metadata/java/src/org/apache/lenya/modules/metadata/MetaDataTransformer.java Tue Dec 30 07:24:33 2008
@@ -100,15 +100,10 @@
 
     /** Helper for lenya document retrival */
     protected String publicationId = null;
-
     protected String area = null;
-
     protected String language = null;
-
     protected String uuid = null;
-
     protected Publication pub;
-
     private DocumentFactory factory;
 
     /**
@@ -210,4 +205,15 @@
             super.endElement(uri, name, raw);
         }
     }
+
+    public void recycle() {
+        super.recycle();
+        this.publicationId = null;
+        this.area = null;
+        this.language = null;
+        this.uuid = null;
+        this.pub = null;
+        this.factory = null;
+    }
+
 }

Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java?rev=730150&r1=730149&r2=730150&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java Tue Dec 30 07:24:33 2008
@@ -249,10 +249,6 @@
 
         getLogger().debug("Setting up transformer");
 
-        this.serviceSelector = null;
-        this.acResolver = null;
-        this.authorizer = null;
-
         this.sourceUrl = ServletHelper.getWebappURI(this.request);
 
         try {
@@ -294,4 +290,14 @@
         }
     }
 
+    public void recycle() {
+        super.recycle();
+        this.publication = null;
+        this.roles = null;
+        this.serviceSelector = null;
+        this.acResolver = null;
+        this.authorizer = null;
+        this.sourceUrl = null;
+    }
+
 }