cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/pipeline AbstractProcessingPipeline.java
Date Thu, 09 Jan 2003 11:31:10 GMT
cziegeler    2003/01/09 03:31:09

  Modified:    src/java/org/apache/cocoon/components/pipeline
                        AbstractProcessingPipeline.java
  Log:
  Expire header should not be set on internal requests
  
  Revision  Changes    Path
  1.27      +10 -8     xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
  
  Index: AbstractProcessingPipeline.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- AbstractProcessingPipeline.java	9 Jan 2003 11:27:59 -0000	1.26
  +++ AbstractProcessingPipeline.java	9 Jan 2003 11:31:09 -0000	1.27
  @@ -461,6 +461,15 @@
       public boolean process(Environment environment)
       throws ProcessingException {
           this.preparePipeline(environment);
  +
  +        // See if we need to set an "Expires:" header
  +        if (this.expires != 0) {
  +            Response res = ObjectModelHelper.getResponse(environment.getObjectModel());
  +            res.setDateHeader("Expires", expires);
  +            environment.getObjectModel().put(ObjectModelHelper.EXPIRES_OBJECT,
  +                 new Long(expires));
  +        }
  +
           if ( this.reader != null ) {
               if (this.checkLastModified( environment )) {
                   return true;
  @@ -482,13 +491,6 @@
               throw new ProcessingException("Attempted to process incomplete pipeline.");
           }
   
  -        // See if we need to set an "Expires:" header
  -        if (this.expires != 0) {
  -            Response res = ObjectModelHelper.getResponse(environment.getObjectModel());
  -            res.setDateHeader("Expires", expires);
  -            environment.getObjectModel().put(ObjectModelHelper.EXPIRES_OBJECT,
  -                 new Long(expires));
  -        }
           if ( this.reader != null ) {
               this.setupReader( environment );
           } else {
  
  
  

----------------------------------------------------------------------
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


Mime
View raw message