[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/Requir...

[noreply at shibboleth.net]

Author: putmanb
Date: Sat Jan  9 20:26:31 2016
New Revision: 4420

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4420&view=rev
Log:
OSJ-151: durations in log messages should be given in ISO format, not milliseconds

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/RequiredValidUntilFilter.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/RequiredValidUntilFilter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/RequiredValidUntilFilter.java?rev=4420&r1=4419&r2=4420&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/RequiredValidUntilFilter.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/RequiredValidUntilFilter.java	Sat Jan  9 20:26:31 2016
@@ -21,6 +21,7 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.utilities.java.support.annotation.Duration;
+import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 
 import org.joda.time.DateTime;
 import org.joda.time.chrono.ISOChronology;
@@ -50,7 +51,7 @@
 
     /** Constructor. */
     public RequiredValidUntilFilter() {
-        maxValidityInterval = 0;
+        this(0);
     }
 
     /**
@@ -99,8 +100,9 @@
         if (maxValidityInterval > 0 && validUntil.isAfter(now)) {
             final long validityInterval = validUntil.getMillis() - now.getMillis();
             if (validityInterval > maxValidityInterval) {
-                throw new FilterException("Metadata's validity interval, " + validityInterval
-                        + "ms, is larger than is allowed, " + maxValidityInterval + "ms.");
+                throw new FilterException(String.format("Metadata's validity interval %s is larger than is allowed %s", 
+                        DOMTypeSupport.longToDuration(validityInterval),
+                        DOMTypeSupport.longToDuration(maxValidityInterval)));
             }
         }