From: cantor <cantor@de75baf8-a10c-0410-a50a-987c0e22f00f>
Date: Wed, 2 Jun 2010 01:27:07 +0000 (+0000)
Subject: https://bugs.internet2.edu/jira/browse/CPPXT-59
X-Git-Tag: 1.4.1~89
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fxmltooling.git;a=commitdiff_plain;h=1b5b3db0786b7b9a86314c0b53cf8c6f706930d9

https://bugs.internet2.edu/jira/browse/CPPXT-59


git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/branches/REL_1@749 de75baf8-a10c-0410-a50a-987c0e22f00f
---

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);
 }