Skip to content

Commit f385af2

Browse files
committed
Try solve Timing issues
1 parent 9b6015c commit f385af2

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

core/src/main/java/com/onelogin/saml2/util/Util.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1425,6 +1425,7 @@ public static long parseDuration(String durationString, long timestamp) throws I
14251425

14261426
PeriodFormatter periodFormatter = ISOPeriodFormat.standard();
14271427
Period period = periodFormatter.parsePeriod(durationString);
1428+
14281429
DateTime dt = new DateTime(timestamp * 1000);
14291430

14301431
DateTime result = null;
@@ -1433,7 +1434,7 @@ public static long parseDuration(String durationString, long timestamp) throws I
14331434
} else {
14341435
result = dt.plus(period);
14351436
}
1436-
return result.toGregorianCalendar().getTimeInMillis() / 1000;
1437+
return result.getMillis() / 1000;
14371438
}
14381439

14391440
/**

core/src/test/java/com/onelogin/saml2/test/util/UtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1993,7 +1993,7 @@ public void testGetCurrentTimeStamp() {
19931993
Date currentDate = new Date();
19941994
Long dt = currentDate.getTime() / 1000;
19951995
Long dt2 = Util.getCurrentTimeStamp();
1996-
assertTrue(dt2 - dt == 0 || dt2 - dt == 1);
1996+
assertTrue(dt2 - dt <= 3);
19971997
}
19981998

19991999
/**

0 commit comments

Comments
 (0)