You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by si...@apache.org on 2010/01/30 14:41:47 UTC

svn commit: r904779 - /cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java

Author: simonetripodi
Date: Sat Jan 30 13:41:46 2010
New Revision: 904779

URL: http://svn.apache.org/viewvc?rev=904779&view=rev
Log:
COCOON3-50 SAXException related to endPrefixMapping in XIncludeTransformer by Charles Yates

Modified:
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java

Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java?rev=904779&r1=904778&r2=904779&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XIncludeTransformer.java Sat Jan 30 13:41:46 2010
@@ -491,7 +491,10 @@
     @Override
     public void endPrefixMapping(final String prefix) throws SAXException {
         if (this.isEvaluatingContent()) {
-            this.getSAXConsumer().endPrefixMapping(prefix);
+            // remove xinclude namespace prefix from result document
+            if (!XINCLUDE_NAMESPACE_URI.equals(this.namespaces.get(prefix))) {
+                this.getSAXConsumer().endPrefixMapping(prefix);
+            }
             this.namespaces.remove(prefix);
         }
     }