From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 2 Jun 2010 01:27:07 +0000 (+0000)
Subject: https://issues.shibboleth.net/jira/browse/CPPXT-59
X-Git-Tag: 1.4RC1~68
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=e0b6befafb8e3cc61710083d3ce7f4aa4f30c9ff;p=shibboleth%2Fcpp-xmltooling.git

https://issues.shibboleth.net/jira/browse/CPPXT-59
---

diff --git a/xmltooling/AbstractSimpleElement.cpp b/xmltooling/AbstractSimpleElement.cpp
index a6a29e7..3dea687 100644
--- a/xmltooling/AbstractSimpleElement.cpp
+++ b/xmltooling/AbstractSimpleElement.cpp
@@ -23,8 +23,11 @@
 #include "internal.h"
 #include "AbstractSimpleElement.h"
 
+#include <xercesc/util/XMLChar.hpp>
+
 using namespace xmltooling;
 using xercesc::XMLString;
+using xercesc::XMLChar1_0;
 using namespace std;
 
 // shared "empty" list of children for childless objects
@@ -69,5 +72,13 @@ void AbstractSimpleElement::setTextContent(const XMLCh* value, unsigned int posi
 {
     if (position > 0)
         throw XMLObjectException("Cannot set text content in simple element at position > 0.");
-    m_value=prepareForAssignment(m_value,value);
+
+    // We overwrite the "one" piece of Text content if:
+    //  - the new value is null
+    //  - there is no existing value
+    //  - the old value is all whitespace
+    // If there's a non-whitespace value set, we leave it alone unless we're clearing it with a null.
+
+    if (!value || !m_value || XMLChar1_0::isAllSpaces(m_value, XMLString::stringLen(m_value)))
+        m_value=prepareForAssignment(m_value, value);
 }