cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r160283 - cocoon/trunk/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java cocoon/trunk/status.xml
Date Wed, 06 Apr 2005 10:39:26 GMT
Author: antonio
Date: Wed Apr  6 03:39:24 2005
New Revision: 160283

URL: http://svn.apache.org/viewcvs?view=rev&rev=160283
Log:
Fix bug #34325 due to Joachim Breitsprecher

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
    cocoon/trunk/status.xml

Modified: cocoon/trunk/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java?view=diff&r1=160282&r2=160283
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java Wed Apr
 6 03:39:24 2005
@@ -171,7 +171,9 @@
             } else if (xIncludeLevel > 0 && fallbackLevel < 1) {
                 xIncludeLevel++;
                 return;
-            }
+            } else if (xIncludeLevel > 0 && fallbackLevel > 0) {
+                fallbackLevel++;
+            } 
 
             xmlBaseSupport.startElement(uri, name, raw, attr);
             if (XINCLUDE_NAMESPACE_URI.equals(uri)) {

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diff&r1=160282&r2=160283
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Wed Apr  6 03:39:24 2005
@@ -426,6 +426,9 @@
    </action>
   </release>
   <release version="2.1.8" date="TBD">
+    <action dev="AG" type="fix" fixes-bug="34325"i due-to="Joachim Breitsprecher" due-to-email="jb@dserv.net">
+      XInclude transformer does not handle fallback correctly.
+    </action>
     <action dev="VG" type="update">
       Deprecate EventRecorder (in o.a.c.t.helpers package). It will be
       removed starting with Cocoon 2.2.



Mime
View raw message