Solve UTC issue on parseDuration

Author: pitbulk

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

@@ -32,6 +32,7 @@
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Random;
 import java.util.TimeZone;
@@ -1422,12 +1423,11 @@ public static long parseDuration(String durationString, long timestamp) throws I
 			haveMinus = true;
 		}
 
-		PeriodFormatter periodFormatter = ISOPeriodFormat.standard();
+		PeriodFormatter periodFormatter = ISOPeriodFormat.standard().withLocale(new Locale("UTC"));
 		Period period = periodFormatter.parsePeriod(durationString);
 
-		DateTime dt = new DateTime(timestamp * 1000);
-		dt.toDateTime(DateTimeZone.UTC);
-	
+		DateTime dt = new DateTime(timestamp * 1000, DateTimeZone.UTC);
+
 		DateTime result = null;
 		if (haveMinus) {
 			result = dt.minus(period);
@@ -1441,8 +1441,7 @@ public static long parseDuration(String durationString, long timestamp) throws I
 	 * @return the unix timestamp that matches the current time.
 	 */
 	public static Long getCurrentTimeStamp() {
-		DateTime currentDate = new DateTime();
-		currentDate.toDateTime(DateTimeZone.UTC);
+		DateTime currentDate = new DateTime(DateTimeZone.UTC);
 		return currentDate.getMillis() / 1000;
 	}
 
@@ -1538,6 +1537,7 @@ public static String formatDateTime(long timeInMillis, boolean millis) {
 	 * @return datetime
 	 */
 	public static DateTime parseDateTime(String dateTime) {
+		
 		DateTime parsedData = null;
 		try {
 			parsedData = DATE_TIME_FORMAT.parseDateTime(dateTime);

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

@@ -1940,14 +1940,11 @@ public void testUniqid() {
 	 * 
 	 * @see com.onelogin.saml2.util.Util#parseDuration
 	 */
-/* TODO 
- * 	
 	@Test(expected=IllegalArgumentException.class)
 	public void testParseDurationException() throws Exception {
 		long timestamp = 1393876825L;// 2014-03-03 21:00:25
 		long parsedDuration = Util.parseDuration("aaa", timestamp);
 	}
-*/
 
 	/**
 	 * Tests the parseDuration method
@@ -1969,7 +1966,7 @@ public void testParseDuration() throws Exception {
 
 		String newDuration = "P1Y1M";
 		long parsedDuration4 = Util.parseDuration(newDuration, timestamp);
-		assertEquals(1428087625L, parsedDuration4);
+		assertEquals(1428091225L, parsedDuration4);
 
 		String negDuration = "-P14M";
 		long parsedDuration5 = Util.parseDuration(negDuration, timestamp);