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 Cocoon.java
Date Fri, 10 Jan 2003 10:42:01 GMT
cziegeler    2003/01/10 02:42:00

  Modified:    src/java/org/apache/cocoon Cocoon.java
  Log:
  Adding error message *if* the environment is not properly cleaned. Perhaps this helps in
finding/reproducing the problem
  
  Revision  Changes    Path
  1.45      +8 -1      xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java
  
  Index: Cocoon.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/Cocoon.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Cocoon.java	9 Jan 2003 11:27:59 -0000	1.44
  +++ Cocoon.java	10 Jan 2003 10:42:00 -0000	1.45
  @@ -69,6 +69,7 @@
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.cocoon.components.CocoonComponentManager;
  +import org.apache.cocoon.components.EnvironmentStack;
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.components.language.generator.ProgramGenerator;
   import org.apache.cocoon.components.pipeline.ProcessingPipeline;
  @@ -608,6 +609,7 @@
               }
               // commit response on success
               environment.commitResponse();
  +
               return result;
           } catch (Exception any) {
               // reset response on error
  @@ -618,6 +620,11 @@
               CocoonComponentManager.endProcessing(environment, key);
               if (this.getLogger().isDebugEnabled()) {
                   --activeRequestCount;
  +            }
  +            // TODO (CZ): This is only for testing - remove it later on
  +            EnvironmentStack stack = CocoonComponentManager.getCurrentEnvironmentStack();
  +            if (stack != null && !stack.isEmpty() ) {
  +                this.getLogger().error("ENVIRONMENT STACK HAS NOT BEEN CLEANED PROPERLY");
       
               }
           }
       }
  
  
  

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