cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r384717 - in /cocoon/branches/BRANCH_2_1_X: src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java status.xml
Date Fri, 10 Mar 2006 06:41:59 GMT
Author: antonio
Date: Thu Mar  9 22:41:58 2006
New Revision: 384717

URL: http://svn.apache.org/viewcvs?rev=384717&view=rev
Log:

<action dev="AG" type="fix" fixes-bug="COCOON-1799" due-to="Simone Gianni" due-to-email="s.gianni@thebug.it">
   Threads waste when reading a not found resource.
</action>

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java?rev=384717&r1=384716&r2=384717&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
Thu Mar  9 22:41:58 2006
@@ -882,8 +882,6 @@
 	                    if (readerValidity != null) {
 	                        outputStream = environment.getOutputStream(this.outputBufferSize);
 	                        outputStream = new CachingOutputStream(outputStream);
-	                    } else {
-	                        pcKey = null;
 	                    }
 	                }
 	
@@ -906,7 +904,7 @@
 	                }
 	
 	                // store the response
-	                if (pcKey != null) {
+	                if (pcKey != null && readerValidity != null) {
 	                    final CachedResponse res = new CachedResponse(new SourceValidity[] {readerValidity},
 	                            ((CachingOutputStream)outputStream).getContent());
 	                    res.setContentType(environment.getContentType());

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=384717&r1=384716&r2=384717&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Mar  9 22:41:58 2006
@@ -180,6 +180,9 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.9" date="TBD">
+    <action dev="AG" type="fix" fixes-bug="COCOON-1799" due-to="Simone Gianni" due-to-email="s.gianni@thebug.it">
+       Threads waste when reading a not found resource.
+    </action>
     <action dev="AG" type="fix" fixes-bug="COCOON-1796" due-to="Freek Segers" due-to-email="freek.segers@nerocmediaware.nl">
        TraversableGenerator calls resolveURI() twice but release() only once.
     </action>



Mime
View raw message