You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ra...@apache.org on 2006/01/31 01:05:21 UTC

svn commit: r373637 - in /xmlbeans/branches/1.x/src: typeimpl/org/apache/xmlbeans/impl/values/XmlObjectBase.java xmlstore/org/apache/xmlbeans/impl/store/Splay.java

Author: radup
Date: Mon Jan 30 16:05:19 2006
New Revision: 373637

URL: http://svn.apache.org/viewcvs?rev=373637&view=rev
Log:
Fixed xsi:nil handling. Contributed by Tracey Powers.


Modified:
    xmlbeans/branches/1.x/src/typeimpl/org/apache/xmlbeans/impl/values/XmlObjectBase.java
    xmlbeans/branches/1.x/src/xmlstore/org/apache/xmlbeans/impl/store/Splay.java

Modified: xmlbeans/branches/1.x/src/typeimpl/org/apache/xmlbeans/impl/values/XmlObjectBase.java
URL: http://svn.apache.org/viewcvs/xmlbeans/branches/1.x/src/typeimpl/org/apache/xmlbeans/impl/values/XmlObjectBase.java?rev=373637&r1=373636&r2=373637&view=diff
==============================================================================
--- xmlbeans/branches/1.x/src/typeimpl/org/apache/xmlbeans/impl/values/XmlObjectBase.java (original)
+++ xmlbeans/branches/1.x/src/typeimpl/org/apache/xmlbeans/impl/values/XmlObjectBase.java Mon Jan 30 16:05:19 2006
@@ -635,6 +635,10 @@
             {
                 _flags &= ~FLAGS_DATED;
                 get_store().invalidate_nil();
+                // THT When we set a value to nil, we should blank out the text that is
+                // in the node so that when the node is printed out, it doesn't reflect
+                // the old text.
+                get_store().store_text("");
             }
             else
             {

Modified: xmlbeans/branches/1.x/src/xmlstore/org/apache/xmlbeans/impl/store/Splay.java
URL: http://svn.apache.org/viewcvs/xmlbeans/branches/1.x/src/xmlstore/org/apache/xmlbeans/impl/store/Splay.java?rev=373637&r1=373636&r2=373637&view=diff
==============================================================================
--- xmlbeans/branches/1.x/src/xmlstore/org/apache/xmlbeans/impl/store/Splay.java (original)
+++ xmlbeans/branches/1.x/src/xmlstore/org/apache/xmlbeans/impl/store/Splay.java Mon Jan 30 16:05:19 2006
@@ -2321,7 +2321,10 @@
         if (getXsiNil( r ) == nil)
             return;
 
-        setAttr( r, _xsiNil, "true" );
+        // THT - this used to be: setAttr( r, _xsiNil, "true" );
+        // once set to true, this could never be set to false, even if you were un-nilling
+        // a value.
+        setAttr( r, _xsiNil, Boolean.toString(nil) );
     }
 
     boolean getXsiNil ( Root r )



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org