cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/xscript XScriptObject.java

[vgritsenko]

vgritsenko    02/01/24 19:41:13

  Modified:    src/java/org/apache/cocoon/components/source
                        AbstractSAXSource.java
               src/java/org/apache/cocoon/components/xscript
                        XScriptObject.java
  Log:
  Always release parser.
  
  Revision  Changes    Path
  1.3       +1 -3      
xml-cocoon2/src/java/org/apache/cocoon/components/source/AbstractSAXSource.java
  
  Index: AbstractSAXSource.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/AbstractSAXSource.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractSAXSource.java    15 Jan 2002 11:10:52 -0000      1.2
  +++ AbstractSAXSource.java    25 Jan 2002 03:41:13 -0000      1.3
  @@ -39,7 +39,7 @@
    * obtain a valid Source implementation.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Gianugo Rabellino</a>
  - * @version $Id: AbstractSAXSource.java,v 1.2 2002/01/15 11:10:52 sylvain Exp $
  + * @version $Id: AbstractSAXSource.java,v 1.3 2002/01/25 03:41:13 vgritsenko Exp $
    */
   
   public abstract class AbstractSAXSource
  @@ -145,6 +145,4 @@
       public long getLastModified() {
         return 0;
       }
  -
  -
   }
  
  
  
  1.2       +5 -4      
xml-cocoon2/src/java/org/apache/cocoon/components/xscript/XScriptObject.java
  
  Index: XScriptObject.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/xscript/XScriptObject.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XScriptObject.java        3 Jan 2002 12:31:15 -0000       1.1
  +++ XScriptObject.java        25 Jan 2002 03:41:13 -0000      1.2
  @@ -104,19 +104,20 @@
     public void toSAX(ContentHandler handler)
       throws SAXException
     {
  +    Parser parser = null;
       try {
         EmbeddedXMLPipe newHandler = new EmbeddedXMLPipe(handler);
   
  -      Parser parser = (Parser)componentManager.lookup(Parser.ROLE);
  +      parser = (Parser)componentManager.lookup(Parser.ROLE);
         
         parser.setContentHandler(newHandler);
         InputSource source = getInputSource();
         parser.parse(source);
   
  -      componentManager.release(parser);
  -    }
  -    catch (Exception ex) {
  +    } catch (Exception ex) {
         throw new SAXException(ex);
  +    } finally {
  +      if (parser != null) componentManager.release(parser);
       }
     }
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]