You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2002/02/01 15:53:47 UTC

cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java xscript.xsl

vgritsenko    02/02/01 06:53:47

  Modified:    .        changes.xml
               src/java/org/apache/cocoon/components/language/markup/xsp/java
                        xscript.xsl
  Log:
  XScript fixes
  
  Revision  Changes    Path
  1.92      +6 -1      xml-cocoon2/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/changes.xml,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- changes.xml	1 Feb 2002 13:27:32 -0000	1.91
  +++ changes.xml	1 Feb 2002 14:53:46 -0000	1.92
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.91 2002/02/01 13:27:32 vgritsenko Exp $
  +  $Id: changes.xml,v 1.92 2002/02/01 14:53:46 vgritsenko Exp $
   -->
   
   <changes title="History of Changes">
  @@ -31,6 +31,11 @@
    </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="VG" type="fix">
  +    Fixed memory leaks in XScript engine. Fixed global and session scope
  +    variables: now they are shared between XScript pages as it should be.
  +    Page scope variables now visible for all instances of the same page.
  +  </action>
     <action dev="VG" type="add">
       Added size() method to the Store interface.
     </action>
  
  
  
  1.2       +11 -7     xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/xscript.xsl
  
  Index: xscript.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/xscript.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- xscript.xsl	3 Jan 2002 12:31:11 -0000	1.1
  +++ xscript.xsl	1 Feb 2002 14:53:47 -0000	1.2
  @@ -25,17 +25,21 @@
         </xsp:structure>
   
         <xsp:logic>
  -      </xsp:logic>
  -
  -      <xsp:init-page>
           XScriptManager xscriptManager;
  -        try {
  +
  +        public void compose(ComponentManager manager) throws ComponentException {
  +          super.compose(manager);
             xscriptManager = (XScriptManager)this.manager.lookup(XScriptManager.ROLE);
           }
  -        catch (ComponentException ex) {
  -          throw new ProcessingException(ex);
  +
  +        public void dispose() {
  +          if (xscriptManager != null) {
  +            manager.release((Component)xscriptManager);
  +            xscriptManager = null;
  +          }
  +          super.dispose();
           }
  -      </xsp:init-page>
  +      </xsp:logic>
   
         <xsl:apply-templates/>
       </xsp:page>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org