svn commit: r562428 - /cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java

Author: gkossakowski
Date: Fri Aug  3 05:18:49 2007
New Revision: 562428

URL: http://svn.apache.org/viewvc?view=rev&rev=562428
Log:
Moved initialization of ObjectModel to the place that guarantees that ObjectModel will be cleaned up properly.

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=562428&r1=562427&r2=562428
==============================================================================
---
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
Fri Aug  3 05:18:49 2007
 <at>  <at>  -127,7 +127,6  <at>  <at> 
             this.startDocument = scriptManager.resolveTemplate(src);
         }

-        FlowObjectModelHelper.fillNewObjectModelWithFOM(newObjectModel, objectModel, parameters);
         this.namespaces = new NamespacesTable();
         this.definitions = new HashMap();
     }
 <at>  <at>  -144,6 +143,7  <at>  <at> 

     public void performGeneration(Event startEvent, Event endEvent) throws SAXException {
         newObjectModel.markLocalContext();
+        FlowObjectModelHelper.fillNewObjectModelWithFOM(newObjectModel, objectModel, parameters);
         XMLConsumer consumer = new AttributeAwareXMLConsumerImpl(new RedundantNamespacesFilter(this.xmlConsumer));
         ((Map) newObjectModel.get("cocoon")).put("consumer", consumer);
         Invoker.execute(consumer, this.newObjectModel, new ExecutionContext(this.definitions, this.scriptManager,