X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2FAbstractSimpleElement.cpp;h=5782e3bd7f066c970e3b729298ae78fd24583e1f;hb=4fea3adf1e641d4010f86edca81ab382c7f1c2df;hp=43003dd199040cb1b61d36a268506c9ec1559e2d;hpb=bd026f07e729e66127b3efd48aee443fba815af3;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/AbstractSimpleElement.cpp b/xmltooling/AbstractSimpleElement.cpp
index 43003dd..5782e3b 100644
--- a/xmltooling/AbstractSimpleElement.cpp
+++ b/xmltooling/AbstractSimpleElement.cpp
@@ -1,37 +1,44 @@
-/*
- *  Copyright 2001-2009 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
  * AbstractSimpleElement.cpp
  * 
- * Extension of AbstractXMLObject that implements simple elements 
+ * Extension of AbstractXMLObject that implements simple elements.
  */
 
 #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
 
 list<XMLObject*> AbstractSimpleElement::m_no_children;
 
-AbstractSimpleElement::AbstractSimpleElement() : m_value(NULL)
+AbstractSimpleElement::AbstractSimpleElement() : m_value(nullptr)
 {
 }
 
@@ -62,12 +69,20 @@ void AbstractSimpleElement::removeChild(XMLObject* child)
 
 const XMLCh* AbstractSimpleElement::getTextContent(unsigned int position) const
 {
-    return (position==0) ? m_value : NULL;
+    return (position==0) ? m_value : nullptr;
 }
 
 void AbstractSimpleElement::setTextContent(const XMLCh* value, unsigned int position)
 {
     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);
 }