[cpp-opensaml COMMIT] in /branches/REL_2/saml/saml2/metadata/impl: DynamicMetadataProvider.cpp XMLMetadataProvider.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jan 27 02:38:17 2012
New Revision: 699

URL: http://svn.shibboleth.net/view/cpp-opensaml?rev=699&view=rev
Log:
Support option to keep DOM

Modified:
    branches/REL_2/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp
    branches/REL_2/saml/saml2/metadata/impl/XMLMetadataProvider.cpp

Modified: branches/REL_2/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp?rev=699&r1=698&r2=699&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp (original)
+++ branches/REL_2/saml/saml2/metadata/impl/DynamicMetadataProvider.cpp Fri Jan 27 02:38:17 2012
@@ -203,7 +203,7 @@
         }
 
         // Filter it, which may throw.
-        doFilters(*entity2.get());
+        doFilters(*entity2);
 
         time_t now = time(nullptr);
         if (entity2->getValidUntil() && entity2->getValidUntilEpoch() < now + 60)
@@ -239,7 +239,8 @@
 
         // Make sure we clear out any existing copies, including stale metadata or if somebody snuck in.
         cacheExp = SAMLTIME_MAX;
-        indexEntity(entity2.release(), cacheExp, true);
+        indexEntity(entity2.get(), cacheExp, true);
+        entity2.release();
 
         m_lastUpdate = now;
 

Modified: branches/REL_2/saml/saml2/metadata/impl/XMLMetadataProvider.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/impl/XMLMetadataProvider.cpp?rev=699&r1=698&r2=699&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/impl/XMLMetadataProvider.cpp (original)
+++ branches/REL_2/saml/saml2/metadata/impl/XMLMetadataProvider.cpp Fri Jan 27 02:38:17 2012
@@ -137,7 +137,7 @@
             time_t computeNextRefresh();
 
             scoped_ptr<XMLObject> m_object;
-            bool m_discoveryFeed;
+            bool m_discoveryFeed,m_dropDOM;
             double m_refreshDelayFactor;
             unsigned int m_backoffFactor;
             time_t m_minRefreshDelay,m_maxRefreshDelay,m_lastValidUntil;
@@ -149,6 +149,7 @@
         }
 
         static const XMLCh discoveryFeed[] =        UNICODE_LITERAL_13(d,i,s,c,o,v,e,r,y,F,e,e,d);
+        static const XMLCh dropDOM[] =              UNICODE_LITERAL_7(d,r,o,p,D,O,M);
         static const XMLCh minRefreshDelay[] =      UNICODE_LITERAL_15(m,i,n,R,e,f,r,e,s,h,D,e,l,a,y);
         static const XMLCh refreshDelayFactor[] =   UNICODE_LITERAL_18(r,e,f,r,e,s,h,D,e,l,a,y,F,a,c,t,o,r);
     };
@@ -162,6 +163,7 @@
     : MetadataProvider(e), AbstractMetadataProvider(e), DiscoverableMetadataProvider(e),
         ReloadableXMLFile(e, Category::getInstance(SAML_LOGCAT".MetadataProvider.XML"), false),
         m_discoveryFeed(XMLHelper::getAttrBool(e, true, discoveryFeed)),
+        m_dropDOM(XMLHelper::getAttrBool(e, true, dropDOM)),
         m_refreshDelayFactor(0.75), m_backoffFactor(1),
         m_minRefreshDelay(XMLHelper::getAttrInt(e, 600, minRefreshDelay)),
         m_maxRefreshDelay(m_reloadInterval), m_lastValidUntil(SAMLTIME_MAX)
@@ -250,8 +252,10 @@
         preserveCacheTag();
     }
 
-    xmlObject->releaseThisAndChildrenDOM();
-    xmlObject->setDocument(nullptr);
+    if (m_dropDOM) {
+        xmlObject->releaseThisAndChildrenDOM();
+        xmlObject->setDocument(nullptr);
+    }
 
     // Swap it in after acquiring write lock if necessary.
     if (m_lock)