Evolving macros, reduce casting in accessors, add const collection access.

[shibboleth/cpp-xmltooling.git] / xmltooling / AbstractXMLObject.cpp

diff --git a/xmltooling/AbstractXMLObject.cpp b/xmltooling/AbstractXMLObject.cpp
index bb40e91..780304a 100644 (file)
--- a/xmltooling/AbstractXMLObject.cpp
+++ b/xmltooling/AbstractXMLObject.cpp
@@ -61,17 +61,15 @@ XMLObject* AbstractXMLObject::prepareForAssignment(XMLObject* oldValue, XMLObjec
         if (newValue) {
             releaseThisandParentDOM();
             newValue->setParent(this);
-            return newValue;
-        }
-        else {
-            return NULL;
         }
+        return newValue;
     }
 
     if (oldValue != newValue) {
         delete oldValue;
         releaseThisandParentDOM();
-        newValue->setParent(this);
+        if (newValue)
+            newValue->setParent(this);
     }
 
     return newValue;