[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/saml2/metadata/impl/Affi...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jun 19 02:32:19 2012
New Revision: 1575

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1575&view=rev
Log:
[JOST-190] backport fixes from OS 3

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/impl/AffiliationDescriptorImpl.java
    branches/REL_2/src/main/java/org/opensaml/saml2/metadata/impl/RoleDescriptorImpl.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1575&r1=1574&r2=1575&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Tue Jun 19 02:32:19 2012
@@ -1,3 +1,5 @@
+[JOST-190] - Backport some bugfixes from OpenSAML3
+
 Changes in Release 2.5.4
 =============================================
 [JOST-185] - Defaultbootstrap does not initialize the providers from the WS-Trust and WS-Policy schemas in openws

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/metadata/impl/AffiliationDescriptorImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/metadata/impl/AffiliationDescriptorImpl.java?rev=1575&r1=1574&r2=1575&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/metadata/impl/AffiliationDescriptorImpl.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/metadata/impl/AffiliationDescriptorImpl.java Tue Jun 19 02:32:19 2012
@@ -103,7 +103,12 @@
 
     /** {@inheritDoc} */
     public boolean isValid() {
-        return validUntil.isBeforeNow();
+        if (null == validUntil) {
+            return true;
+        }
+        
+        DateTime now = new DateTime();
+        return now.isBefore(validUntil);
     }
 
     /** {@inheritDoc} */

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/metadata/impl/RoleDescriptorImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/metadata/impl/RoleDescriptorImpl.java?rev=1575&r1=1574&r2=1575&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/metadata/impl/RoleDescriptorImpl.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/metadata/impl/RoleDescriptorImpl.java Tue Jun 19 02:32:19 2012
@@ -97,11 +97,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} */
@@ -161,9 +162,7 @@
 
     /** {@inheritDoc} */
     public void removeAllSupportedProtocols() {
-        for (String protocol : supportedProtocols) {
-            removeSupportedProtocol(protocol);
-        }
+        supportedProtocols.clear();
     }
 
     /** {@inheritDoc} */