cvs commit: xml-cocoon/src/org/apache/cocoon/util ComponentPool.java

[bloritsch]

bloritsch    01/03/06 13:55:42

  Modified:    src/org/apache/cocoon/components/language/markup/sitemap/java
                        Tag: xml-cocoon2 sitemap.xsl
               src/org/apache/cocoon/util Tag: xml-cocoon2
                        ComponentPool.java
  Log:
  Fix for ResourcePipeline to force disposal after completion--regardless of
  ProcessingException or no.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.88  +26 -5     
xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
  
  Index: sitemap.xsl
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
  retrieving revision 1.1.2.87
  retrieving revision 1.1.2.88
  diff -u -r1.1.2.87 -r1.1.2.88
  --- sitemap.xsl       2001/03/03 16:05:05     1.1.2.87
  +++ sitemap.xsl       2001/03/06 21:55:39     1.1.2.88
  @@ -94,7 +94,7 @@
        *
        * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo 
Pati</a>
        * @author <a href="mailto:[EMAIL PROTECTED]">Berin 
Loritsch</a>
  -     * @version CVS $Id: sitemap.xsl,v 1.1.2.87 2001/03/03 16:05:05 prussell 
Exp $
  +     * @version CVS $Id: sitemap.xsl,v 1.1.2.88 2001/03/06 21:55:39 
bloritsch Exp $
        */
       public class <xsl:value-of select="@file-name"/> extends AbstractSitemap 
{
         static final String LOCATION = "<xsl:value-of 
select="translate(@file-path, '/', '.')"/>.<xsl:value-of select="@file-name"/>";
  @@ -374,8 +374,8 @@
           /* the &lt;code&gt;ResourcePipeline&lt;/code&gt; used to collect the 
sitemap
              components to produce the requested resource */
           ResourcePipeline pipeline = new ResourcePipeline ();
  -        pipeline.compose(this.manager);
           pipeline.setLogger(getLogger());
  +        pipeline.compose(this.manager);
           /* the &lt;code&gt;List&lt;/code&gt; objects to hold the replacement 
values
              delivered from matchers and selectors to replace occurences of
              XPath kind expressions in values of src attribute used with
  @@ -422,6 +422,7 @@
             private boolean error_process_<xsl:value-of 
select="$pipeline-position"/> (Environment environment, Map objectModel, 
Exception e)
             throws Exception {
               ResourcePipeline pipeline = new ResourcePipeline ();
  +            pipeline.setLogger(getLogger());
               pipeline.compose(this.manager);
               List listOfMaps = (List)(new ArrayList());
               Map map;
  @@ -799,8 +800,16 @@
   
       <!-- the "if(true)" is needed to prevent "statement not reachable" error 
messages during compile -->
       {
  -      boolean result = pipeline.process(environment);
  -      pipeline.dispose();
  +      boolean result = false;
  +
  +      try {
  +          result = pipeline.process(environment);
  +      } catch (Exception pipelineException<xsl:value-of 
select="generate-id(.)"/>) {
  +          getLogger().debug("Error processing pipeline", 
pipelineException<xsl:value-of select="generate-id(.)"/>);
  +      } finally {
  +          pipeline.dispose();
  +      }
  +
         if(true) return result;
       }
     </xsl:template> <!-- match="map:serialize" -->
  @@ -815,7 +824,19 @@
       </xsl:call-template>
   
       <!-- the "if(true)" is needed to prevent "statement not reachable" error 
messages during compile -->
  -    if(true)return pipeline.process (environment);
  +    {
  +      boolean result = false;
  +
  +      try {
  +          result = pipeline.process(environment);
  +      } catch (Exception RpipelineException<xsl:value-of 
select="generate-id(.)"/>) {
  +          getLogger().debug("Error processing pipeline", 
RpipelineException<xsl:value-of select="generate-id(.)"/>);
  +      } finally {
  +          pipeline.dispose();
  +      }
  +
  +      if(true) return result;
  +    }
     </xsl:template> <!-- match="map:read" -->
   
     <!-- generate the code to invoke a sub sitemap  -->
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.14  +2 -0      
xml-cocoon/src/org/apache/cocoon/util/Attic/ComponentPool.java
  
  Index: ComponentPool.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon/src/org/apache/cocoon/util/Attic/ComponentPool.java,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- ComponentPool.java        2001/03/01 20:33:27     1.1.2.13
  +++ ComponentPool.java        2001/03/06 21:55:41     1.1.2.14
  @@ -157,6 +157,7 @@
       public Poolable get()
           throws Exception
       {
  +        log.debug("Component Pool - getting Resource:" + 
this.m_factory.getCreatedClass().getName());
           return get(DEFAULT_WAIT_TIME);
       }
   
  @@ -233,6 +234,7 @@
        */
       public void put(Poolable resource)
       {
  +        log.debug("Component Pool - returning Resource:" + 
this.m_factory.getCreatedClass().getName());
           int pos = -1;
   
           synchronized(this) {