[java-shib-common COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Mar 25 12:05:10 2013
New Revision: 1067

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1067&view=rev
Log:
SC-187: RequiredValidUntilFilter improperly converts duration to milliseconds

Added:
    branches/REL_1/src/test/java/edu/internet2/middleware/shibboleth/common/config/SpringConfigurationUtilsTest.java   (with props)
Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/SpringConfigurationUtils.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/doc/RELEASE-NOTES.txt?rev=1067&r1=1066&r2=1067&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Mon Mar 25 12:05:10 2013
@@ -3,6 +3,7 @@
 [SC-183] - Inappropriate 'RuleReference elements within an AND rule are not supported' error
 [SC-184] - Trap exceptions during LDAP connector pool inititalization
 [SC-186] -  AttributeInMetadata rule for the attribute filter (copied back from uApprove)
+[SC-187] - RequiredValidUntilFilter improperly converts duration to milliseconds
 [SIDP-499] - Allow signed requests to bypass ACS verification
 [SIDP-559] - Attribute queries are ignoring input designators
 [SIDP-575] - Add option to omit NotBefore from assertion conditions

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/SpringConfigurationUtils.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/SpringConfigurationUtils.java?rev=1067&r1=1066&r2=1067&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/SpringConfigurationUtils.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/config/SpringConfigurationUtils.java Mon Mar 25 12:05:10 2013
@@ -17,7 +17,8 @@
 
 package edu.internet2.middleware.shibboleth.common.config;
 
-import java.util.Date;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
 import java.util.List;
 
 import javax.xml.datatype.Duration;
@@ -48,6 +49,9 @@
     /** Log4j logger. */
     private static Logger log = LoggerFactory.getLogger(SpringConfigurationUtils.class);
 
+    /** Baseline for duration calculations (comes from XML Schema standard). */
+    private static Calendar baseline = new GregorianCalendar(1696, 9, 1, 0, 0, 0);
+    
     /** Private Constructor. */
     private SpringConfigurationUtils() {
     }
@@ -258,7 +262,7 @@
         long millis = 0;
         if (duration.startsWith("P")) {
             Duration xmlDuration = XMLHelper.getDataTypeFactory().newDuration(duration);
-            millis = xmlDuration.getTimeInMillis(new Date());
+            millis = xmlDuration.getTimeInMillis(baseline);
         } else {
             try {
                 millis = Long.parseLong(duration);