[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorIm...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jun 13 08:54:09 2012
New Revision: 3065

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3065&view=rev
Log:
A couple of bugs flushed by testing

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java?rev=3065&r1=3064&r2=3065&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/impl/RoleDescriptorImpl.java Wed Jun 13 08:54:09 2012
@@ -98,11 +98,12 @@
 
     /** {@inheritDoc} */
     public boolean isValid() {
-        if (validUntil != null) {
-            return validUntil.isBeforeNow();
-        } else {
+        if (null == validUntil) {
             return true;
         }
+        
+        DateTime now = new DateTime();
+        return now.isBefore(validUntil);
     }
 
     /** {@inheritDoc} */
@@ -162,9 +163,7 @@
 
     /** {@inheritDoc} */
     public void removeAllSupportedProtocols() {
-        for (String protocol : supportedProtocols) {
-            removeSupportedProtocol(protocol);
-        }
+        supportedProtocols.clear();
     }
 
     /** {@inheritDoc} */