You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2004/11/23 15:19:07 UTC
svn commit: r106300 - /cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java /cocoon/branches/BRANCH_2_1_X/status.xml
Author: joerg
Date: Tue Nov 23 06:19:06 2004
New Revision: 106300
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
cocoon/branches/BRANCH_2_1_X/status.xml
Log:
Batik block: Fixed handling for empty extract URIs when matching on null namespace URIs. (bug 32342)
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java?view=diff&rev=106300&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java&r1=106299&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java&r2=106300
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java Tue Nov 23 06:19:06 2004
@@ -67,7 +67,7 @@
* </pre>
*
* @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
- * @version CVS $Id: FragmentExtractorTransformer.java,v 1.11 2004/03/28 05:29:04 antonio Exp $
+ * @version CVS $Id$
*/
public class FragmentExtractorTransformer extends AbstractTransformer
implements CacheableProcessingComponent, Configurable, Serviceable, Disposable, Recyclable {
@@ -213,7 +213,7 @@
*/
public void startElement(String uri, String loc, String raw, Attributes a)
throws SAXException {
- if (this.extractURI.equals(uri) && this.extractElement.equals(loc)) {
+ if ((uri == null || this.extractURI.equals(uri)) && this.extractElement.equals(loc)) {
extractLevel++;
fragmentID++;
if (getLogger().isDebugEnabled()) {
@@ -264,7 +264,7 @@
super.endElement(uri, loc, raw);
} else {
this.serializer.endElement(uri, loc, raw);
- if (this.extractURI.equals(uri) && this.extractElement.equals(loc)) {
+ if ((uri == null || this.extractURI.equals(uri)) && this.extractElement.equals(loc)) {
extractLevel--;
if (getLogger().isDebugEnabled()) {
getLogger().debug("extractLevel now " + extractLevel + ".");
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&rev=106300&p1=cocoon/branches/BRANCH_2_1_X/status.xml&r1=106299&p2=cocoon/branches/BRANCH_2_1_X/status.xml&r2=106300
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Nov 23 06:19:06 2004
@@ -202,19 +202,23 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="JH" type="fix" fixes-bug="32342">
+ Batik block: Fixed handling for empty extract URIs when matching on null
+ namespace URIs.
+ </action>
<action dev="GP" type="add">
- Allow attribute values to be matches as well for EncodeURLTransformer.
+ Allow attribute values to be matches as well for EncodeURLTransformer.
+ </action>
+ <action dev="BRD" type="fix">
+ Multipart requests: use container encoding for decoding requests, in order to have consistent
+ handling between normal requests and multipart requests.
+ </action>
+ <action dev="BRD" type="fix" due-to="Neil Bacon" fixes-bug="31887" due-to-email="nbacon@pinnaclesoftware.com.au">
+ I18n (ParamSaxBuffer): handle case where substitution params like {0} are split over multiple character events.
+ </action>
+ <action dev="LG" type="fix">
+ Fix: Continuation can only be invoked for the interpreter it was originally created for.
</action>
- <action dev="BRD" type="fix">
- Multipart requests: use container encoding for decoding requests, in order to have consistent
- handling between normal requests and multipart requests.
- </action>
- <action dev="BRD" type="fix" due-to="Neil Bacon" fixes-bug="31887" due-to-email="nbacon@pinnaclesoftware.com.au">
- I18n (ParamSaxBuffer): handle case where substitution params like {0} are split over multiple character events.
- </action>
- <action dev="LG" type="fix">
- Fix: Continuation can only be invoked for the interpreter it was originally created for.
- </action>
</release>
<release version="2.1.6" date="November 19 2004">
<action dev="AG" type="fix" fixes-bug="23118" due-to="Jorg Heymans" due-to-email="jh@domek.be">