You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2006/03/10 06:43:59 UTC
svn commit: r384704 - in /cocoon/branches/BRANCH_2_1_X:
src/java/org/apache/cocoon/generation/TraversableGenerator.java status.xml
Author: antonio
Date: Thu Mar 9 21:43:57 2006
New Revision: 384704
URL: http://svn.apache.org/viewcvs?rev=384704&view=rev
Log:
<action dev="AG" type="fix" fixes-bug="COCOON-1796" due-to="Freek Segers" due-to-email="freek.segers@nerocmediaware.nl">
TraversableGenerator calls resloveURI() twice but release() only once.
</action>
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/TraversableGenerator.java
cocoon/branches/BRANCH_2_1_X/status.xml
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/TraversableGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/TraversableGenerator.java?rev=384704&r1=384703&r2=384704&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/TraversableGenerator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/TraversableGenerator.java Thu Mar 9 21:43:57 2006
@@ -313,8 +313,7 @@
if (!(src instanceof TraversableSource)) {
throw new SourceException(this.source + " is not a traversable source");
}
- final TraversableSource inputSource =
- (TraversableSource) this.resolver.resolveURI(this.source);
+ final TraversableSource inputSource = (TraversableSource) src;
if (!inputSource.exists()) {
throw new ResourceNotFoundException(this.source + " does not exist.");
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=384704&r1=384703&r2=384704&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Mar 9 21:43:57 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-1796" due-to="Freek Segers" due-to-email="freek.segers@nerocmediaware.nl">
+ TraversableGenerator calls resloveURI() twice but release() only once.
+ </action>
<action dev="CZ" type="fix">
Portal Block: Remove "external" attribute from coplet links.
</action>