xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minc...@apache.org
Subject svn commit: r415778 - /xalan/java/trunk/src/org/apache/xml/serializer/ToStream.java
Date Tue, 20 Jun 2006 19:30:15 GMT
Author: minchau
Date: Tue Jun 20 12:30:15 2006
New Revision: 415778

URL: http://svn.apache.org/viewvc?rev=415778&view=rev
Log:
The patch in xalanj-2219 is applied, which is to fix
a bug where the default namespace gets stomped on due
to some DOM manipulation.

Modified:
    xalan/java/trunk/src/org/apache/xml/serializer/ToStream.java

Modified: xalan/java/trunk/src/org/apache/xml/serializer/ToStream.java
URL: http://svn.apache.org/viewvc/xalan/java/trunk/src/org/apache/xml/serializer/ToStream.java?rev=415778&r1=415777&r2=415778&view=diff
==============================================================================
--- xalan/java/trunk/src/org/apache/xml/serializer/ToStream.java (original)
+++ xalan/java/trunk/src/org/apache/xml/serializer/ToStream.java Tue Jun 20 12:30:15 2006
@@ -2345,6 +2345,7 @@
 
         if (pushed)
         {
+            boolean was_added = false;
             /* Brian M.: don't know if we really needto do this. The
              * callers of this object should have injected both
              * startPrefixMapping and the attributes.  We are 
@@ -2354,7 +2355,7 @@
             if (EMPTYSTRING.equals(prefix))
             {
                 name = "xmlns";
-                addAttributeAlways(XMLNS_URI, name, name, "CDATA", uri, false);
+                was_added = addAttributeAlways(XMLNS_URI, name, name, "CDATA", uri, false);
             }
             else
             {
@@ -2367,9 +2368,24 @@
                      *  the      uri is the value, that is why we pass it in the
                      * value, or 5th slot of addAttributeAlways()
                      */
-                    addAttributeAlways(XMLNS_URI, prefix, name, "CDATA", uri, false);
+                    was_added = addAttributeAlways(XMLNS_URI, prefix, name, "CDATA", uri,
false);
                 }
             }
+            
+            if (was_added == false && shouldFlush == false) {
+                // We pushed this namespace onto the stack, and we
+                // tried to update the pseudo-attribute value, but that didn't work
+                // so we now pop the value from the namespace stack.
+                //
+                // We already had a pseudo attribute of the form
+                // xmlns='uri' or xmlsn:pfx='uri' on this element.
+                // We were trying to update the value of pseudo-attribute.
+                // was_added is false, so we didn't update the value, hence
+                // we are not even going to accept the mapping itself,
+                // the caller is in error.
+                m_prefixMap.popNamespace(prefix);
+                pushed = false;                
+            }
         }
         return pushed;
     }
@@ -3019,6 +3035,7 @@
 
         if (index >= 0)
         {
+            // Trying to update the value of an existing attribute
             String old_value = null;
             if (m_tracer != null)
             {
@@ -3031,7 +3048,20 @@
              * We may have a null uri or localName, but all we really
              * want to re-set is the value anyway.
              */
-            m_attributes.setValue(index, value);
+            if ("xmlns".equals(localName)) {
+                // Don't update pseudo-attributes of the form xmlns='uri'
+                ;
+            }
+            else if (rawName != null && rawName.startsWith("xmlns:")) {
+                // Don't update pseudo-attributes of the form xmlns:prf='uri'
+                ;
+            }
+            else {
+                // Update normal attributes, which is OK because this could
+                // be from an xsl:attribute element in the stylesheet.
+                m_attributes.setValue(index, value);
+            }
+            
             was_added = false;
             if (old_value != null)
                 firePseudoAttributes();



---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message