[cpp-opensaml COMMIT] in /branches/REL_2/saml: saml1/core/impl/AssertionsImpl.cpp saml1/core/impl/ProtocolsImpl.cpp s...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov 22 19:57:50 2011
New Revision: 682

URL: http://svn.shibboleth.net/view/cpp-opensaml?rev=682&view=rev
Log:
https://issues.shibboleth.net/jira/browse/CPPOST-71

Modified:
    branches/REL_2/saml/saml1/core/impl/AssertionsImpl.cpp
    branches/REL_2/saml/saml1/core/impl/ProtocolsImpl.cpp
    branches/REL_2/saml/saml2/core/impl/Assertions20Impl.cpp
    branches/REL_2/saml/saml2/core/impl/Protocols20Impl.cpp
    branches/REL_2/saml/saml2/metadata/impl/MetadataImpl.cpp

Modified: branches/REL_2/saml/saml1/core/impl/AssertionsImpl.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml1/core/impl/AssertionsImpl.cpp?rev=682&r1=681&r2=682&view=diff
==============================================================================
--- branches/REL_2/saml/saml1/core/impl/AssertionsImpl.cpp (original)
+++ branches/REL_2/saml/saml1/core/impl/AssertionsImpl.cpp Tue Nov 22 19:57:50 2011
@@ -136,6 +136,10 @@
             public AbstractXMLObjectMarshaller,
             public AbstractXMLObjectUnmarshaller
         {
+            void init() {
+                m_NotBefore=m_NotOnOrAfter=nullptr;
+            }
+
         public:
             virtual ~ConditionsImpl() {
                 delete m_NotBefore;
@@ -176,10 +180,6 @@
                 }
             }
 
-            void init() {
-                m_NotBefore=m_NotOnOrAfter=nullptr;
-            }
-
             IMPL_XMLOBJECT_CLONE(Conditions);
             IMPL_DATETIME_ATTRIB(NotBefore,0);
             IMPL_DATETIME_ATTRIB(NotOnOrAfter,SAMLTIME_MAX);
@@ -212,6 +212,10 @@
             public AbstractXMLObjectMarshaller,
             public AbstractXMLObjectUnmarshaller
         {
+            void init() {
+                m_Format=m_NameQualifier=nullptr;
+            }
+
         public:
             virtual ~NameIdentifierImpl() {
                 XMLString::release(&m_Format);
@@ -230,10 +234,6 @@
                 setNameQualifier(src.getNameQualifier());
             }
 
-            void init() {
-                m_Format=m_NameQualifier=nullptr;
-            }
-
             IMPL_XMLOBJECT_CLONE(NameIdentifier);
             IMPL_STRING_ATTRIB(Format);
             IMPL_STRING_ATTRIB(NameQualifier);
@@ -271,29 +271,6 @@
             public AbstractXMLObjectMarshaller,
             public AbstractXMLObjectUnmarshaller
         {
-        public:
-            virtual ~SubjectConfirmationImpl() {}
-
-            SubjectConfirmationImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
-                : AbstractXMLObject(nsURI, localName, prefix, schemaType) {
-                init();
-            }
-
-            SubjectConfirmationImpl(const SubjectConfirmationImpl& src)
-                    : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {
-                init();
-                if (src.getSubjectConfirmationData())
-                    setSubjectConfirmationData(src.getSubjectConfirmationData()->clone());
-                if (src.getKeyInfo())
-                    setKeyInfo(src.getKeyInfo()->cloneKeyInfo());
-                VectorOf(ConfirmationMethod) v=getConfirmationMethods();
-                for (vector<ConfirmationMethod*>::const_iterator i=src.m_ConfirmationMethods.begin(); i!=src.m_ConfirmationMethods.end(); i++) {
-                    if (*i) {
-                        v.push_back((*i)->cloneConfirmationMethod());
-                    }
-                }
-            }
-
             void init() {
                 m_SubjectConfirmationData=nullptr;
                 m_KeyInfo=nullptr;
@@ -304,6 +281,28 @@
                 ++m_pos_KeyInfo;
             }
 
+        public:
+            virtual ~SubjectConfirmationImpl() {}
+
+            SubjectConfirmationImpl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType)
+                : AbstractXMLObject(nsURI, localName, prefix, schemaType) {
+                init();
+            }
+
+            SubjectConfirmationImpl(const SubjectConfirmationImpl& src)
+                    : AbstractXMLObject(src), AbstractComplexElement(src), AbstractDOMCachingXMLObject(src) {
+                init();
+                if (src.getSubjectConfirmationData())
+                    setSubjectConfirmationData(src.getSubjectConfirmationData()->clone());
+                if (src.getKeyInfo())
+                    setKeyInfo(src.getKeyInfo()->cloneKeyInfo());
+                for (vector<ConfirmationMethod*>::const_iterator i=src.m_ConfirmationMethods.begin(); i!=src.m_ConfirmationMethods.end(); i++) {
+                    if (*i) {
+                        getConfirmationMethods().push_back((*i)->cloneConfirmationMethod());
+                    }
+                }
+            }
+
             IMPL_XMLOBJECT_CLONE(SubjectConfirmation);
             IMPL_TYPED_CHILDREN(ConfirmationMethod,m_pos_SubjectConfirmationData);
             IMPL_XMLOBJECT_CHILD(SubjectConfirmationData);
@@ -327,23 +326,6 @@
             public AbstractXMLObjectMarshaller,

[... 1598 lines stripped ...]