X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=saml%2Fsaml2%2Fmetadata%2Fimpl%2FRequireValidUntilMetadataFilter.cpp;h=4d397f96c19cb220a91b796c089f634616f71336;hp=c266fbd59ff2fb03dc964ad6cbb9c9706e834edd;hb=e9554c255ad3c91c7c4976e7a1a54905903e66a2;hpb=50f75e2cd3ddaca8e9808a3e5af9517deca3c9c3

diff --git a/saml/saml2/metadata/impl/RequireValidUntilMetadataFilter.cpp b/saml/saml2/metadata/impl/RequireValidUntilMetadataFilter.cpp
index c266fbd..4d397f9 100644
--- a/saml/saml2/metadata/impl/RequireValidUntilMetadataFilter.cpp
+++ b/saml/saml2/metadata/impl/RequireValidUntilMetadataFilter.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2008 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ static const XMLCh maxValidityInterval[] =  UNICODE_LITERAL_19(m,a,x,V,a,l,i,d,i
 
 RequireValidUntilMetadataFilter::RequireValidUntilMetadataFilter(const DOMElement* e) : m_maxValidityInterval(60 * 60 * 24 * 7)
 {
-    const XMLCh* mvi = e ? e->getAttributeNS(NULL,maxValidityInterval) : NULL;
+    const XMLCh* mvi = e ? e->getAttributeNS(nullptr,maxValidityInterval) : nullptr;
     if (mvi && *mvi) {
         m_maxValidityInterval = XMLString::parseInt(mvi);
         if (m_maxValidityInterval == 0)
@@ -77,6 +77,6 @@ void RequireValidUntilMetadataFilter::doFilter(XMLObject& xmlObject) const
     if (!tbo->getValidUntil())
         throw MetadataFilterException("Metadata did not include a validUntil attribute.");
 
-    if (tbo->getValidUntilEpoch() - time(NULL) > m_maxValidityInterval)
+    if (tbo->getValidUntilEpoch() - time(nullptr) > m_maxValidityInterval)
         throw MetadataFilterException("Metadata validity interval is larger than permitted.");
 }