Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 76938 invoked from network); 25 Jul 2007 13:22:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Jul 2007 13:22:02 -0000 Received: (qmail 93548 invoked by uid 500); 25 Jul 2007 13:21:48 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 93484 invoked by uid 500); 25 Jul 2007 13:21:48 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 93453 invoked by uid 99); 25 Jul 2007 13:21:48 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jul 2007 06:21:48 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jul 2007 06:21:45 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 916E51A981A; Wed, 25 Jul 2007 06:21:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r559450 - /cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java Date: Wed, 25 Jul 2007 13:21:23 -0000 To: cvs@cocoon.apache.org From: gkossakowski@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070725132124.916E51A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gkossakowski Date: Wed Jul 25 06:21:15 2007 New Revision: 559450 URL: http://svn.apache.org/viewvc?view=rev&rev=559450 Log: Wrongly performed cleanup in JXTemplateGenerator. Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java?view=diff&rev=559450&r1=559449&r2=559450 ============================================================================== --- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java (original) +++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java Wed Jul 25 06:21:15 2007 @@ -98,6 +98,10 @@ this.manager.release(this.scriptManager); this.scriptManager = null; } + if (this.newObjectModel != null) { + this.manager.release(this.newObjectModel); + this.newObjectModel = null; + } super.dispose(); } @@ -106,7 +110,6 @@ */ public void recycle() { this.startDocument = null; - this.newObjectModel = null; this.namespaces = null; this.definitions = null; super.recycle();