svn commit: r106301 - /cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java /cocoon/trunk/status.xml

[jo...@apache.org]

Author: joerg
Date: Tue Nov 23 06:20:05 2004
New Revision: 106301

Modified:
   cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
   cocoon/trunk/status.xml
Log:
Batik block: Fixed handling for empty extract URIs when matching on null namespace URIs. (bug 32342)

Modified: cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java?view=diff&rev=106301&p1=cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java&r1=106300&p2=cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java&r2=106301
==============================================================================
--- cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java	(original)
+++ cocoon/trunk/src/blocks/batik/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java	Tue Nov 23 06:20:05 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/trunk/status.xml
Url: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diff&rev=106301&p1=cocoon/trunk/status.xml&r1=106300&p2=cocoon/trunk/status.xml&r2=106301
==============================================================================
--- cocoon/trunk/status.xml	(original)
+++ cocoon/trunk/status.xml	Tue Nov 23 06:20:05 2004
@@ -202,15 +202,19 @@
 
   <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.
    </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" 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="CZ" type="add" due-to="Sascha-Matthias Kulawik" due-to-email="sascha@kulawik.de">
      Authentication block: Add authenticator for JAAS.
    </action>
@@ -263,7 +267,7 @@
      </code>
    </action>
    <action dev="ATC" type="remove">
-    Removed the PHP block.
+     Removed the PHP block.
    </action>
    <action dev="CZ" type="update">
      Remove support for Excalibur instrumentation.