cvs commit: cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler ProfilingCachingProcessingPipeline.java ProfilingNonCachingProcessingPipeline.java

[stephan]

stephan     2004/02/02 05:50:37

  Modified:    src/blocks/profiler/java/org/apache/cocoon/components/profiler
                        ProfilingCachingProcessingPipeline.java
                        ProfilingNonCachingProcessingPipeline.java
  Log:
  Support for serializer, which implements SitemapModelComponent, see
  http://nagoya.apache.org/bugzilla/show_bug.cgi?id=26378
  
  Revision  Changes    Path
  1.5       +13 -1     
cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingCachingProcessingPipeline.java
  
  Index: ProfilingCachingProcessingPipeline.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingCachingProcessingPipeline.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProfilingCachingProcessingPipeline.java   3 Jul 2003 07:59:59 -0000       
1.4
  +++ ProfilingCachingProcessingPipeline.java   2 Feb 2004 13:50:37 -0000       
1.5
  @@ -59,6 +59,7 @@
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline;
   import org.apache.cocoon.environment.Environment;
  +import org.apache.cocoon.sitemap.SitemapModelComponent;
   import org.apache.cocoon.transformation.Transformer;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.XMLProducer;
  @@ -233,6 +234,17 @@
                   this.data.setSetupTime(index++,
                                          System.currentTimeMillis()-time);
               }
  +
  +            time = System.currentTimeMillis();
  +            if (this.serializer instanceof SitemapModelComponent) {
  +                ((SitemapModelComponent)this.serializer).setup(
  +                    environment,
  +                    environment.getObjectModel(),
  +                    serializerSource,
  +                    serializerParam
  +                );
  +            }
  +            this.data.setSetupTime(index++, System.currentTimeMillis()-time);
   
               String mimeType = this.serializer.getMimeType();
   
  
  
  
  1.5       +13 -1     
cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingNonCachingProcessingPipeline.java
  
  Index: ProfilingNonCachingProcessingPipeline.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingNonCachingProcessingPipeline.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProfilingNonCachingProcessingPipeline.java        3 Jul 2003 07:59:59 
-0000       1.4
  +++ ProfilingNonCachingProcessingPipeline.java        2 Feb 2004 13:50:37 
-0000       1.5
  @@ -60,6 +60,7 @@
   import org.apache.cocoon.ProcessingException;
   import 
org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline;
   import org.apache.cocoon.environment.Environment;
  +import org.apache.cocoon.sitemap.SitemapModelComponent;
   import org.apache.cocoon.transformation.Transformer;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.XMLProducer;
  @@ -237,6 +238,17 @@
                   this.data.setSetupTime(index++,
                                          System.currentTimeMillis()-time);
               }
  +
  +            time = System.currentTimeMillis();
  +            if (this.serializer instanceof SitemapModelComponent) {
  +                ((SitemapModelComponent)this.serializer).setup(
  +                    environment,
  +                    environment.getObjectModel(),
  +                    serializerSource,
  +                    serializerParam
  +                );
  +            }
  +            this.data.setSetupTime(index++, System.currentTimeMillis()-time);
   
               String mimeType = this.serializer.getMimeType();