Commit fa206848 authored by gmantele's avatar gmantele
Browse files

[UWS,TAP] Synchronize access to ISO8601Format. 

This class is using static attributes of type DecimalFormat.
Unfortunately this type of objects can NOT be accessed by multiple
threads simultaneously: it is not thread-safe. Parsing errors,
mostly during TAP uploads, have been experienced for this reason.

To solve quickly this issue, the main static public functions of
ISO8601Format have been synchronized.
parent 8c650059

src/uws/ISO8601Format.java

+25 −11
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ package uws; 
 * You should have received a copy of the GNU Lesser General Public License

 * along with UWSLibrary.  If not, see <http://www.gnu.org/licenses/>.

 * 

 * Copyright 2014-2016 - Astronomisches Rechen Institut (ARI)

 * Copyright 2014-2017 - Astronomisches Rechen Institut (ARI)

 */



import java.text.DecimalFormat;
@@ -95,7 +95,7 @@ import java.util.regex.Pattern; 
 * </p>

 * 

 * @author Gr&eacute;gory Mantelet (CDS;ARI)

 * @version 4.2 (01/2016)

 * @version 4.2 (03/2017)

 * @since 4.1

 */

public class ISO8601Format {
@@ -202,6 +202,13 @@ public class ISO8601Format { 
	 * Convert the given date in the given time zone and format it in ISO8601 format, with or without displaying the time zone

	 * and/or the milliseconds field.

	 * 

	 * <p><i><b>Important Note:</b>

	 * 	This function is synchronized because it is using (directly or in other static functions) static {@link DecimalFormat} instances.

	 * 	A {@link DecimalFormat} is a Java class which can be used only by one thread at a time. So {@link #format(long, String, boolean, boolean)}

	 * 	and {@link #parse(String)} (main public functions of {@link ISO8601Format}) must be synchronized in order to avoid concurrent access

	 * 	to the {@link DecimalFormat} instances and so to avoid unpredictable errors/results.

	 * </i></p>

	 * 

	 * @param date				Date-time in milliseconds (from the 1st January 1970 ; this value is returned by java.util.Date#getTime()).

	 * @param targetTimeZone	Target time zone.

	 * @param withTimeZone		<i>true</i> to display the time zone, <i>false</i> otherwise.
@@ -209,7 +216,7 @@ public class ISO8601Format { 
	 * 

	 * @return	Date formatted in ISO8601.

	 */

	protected static String format(final long date, final String targetTimeZone, final boolean withTimeZone, final boolean withMillisec){

	protected static synchronized String format(final long date, final String targetTimeZone, final boolean withTimeZone, final boolean withMillisec){

		GregorianCalendar cal = new GregorianCalendar();

		cal.setTimeInMillis(date);
@@ -393,6 +400,13 @@ public class ISO8601Format { 
	 * 	Separators (like '-', ':' and '.') are optional. The date and time separator ('T') may be replaced by a space.

	 * </p>

	 * 

	 * <p><i><b>Important Note:</b>

	 * 	This function is synchronized because it is using (directly or in other static functions) static {@link DecimalFormat} instances.

	 * 	A {@link DecimalFormat} is a Java class which can be used only by one thread at a time. So {@link #format(long, String, boolean, boolean)}

	 * 	and {@link #parse(String)} (main public functions of {@link ISO8601Format}) must be synchronized in order to avoid concurrent access

	 * 	to the {@link DecimalFormat} instances and so to avoid unpredictable errors/results.

	 * </i></p>

	 * 

	 * @param strDate	Date expressed as a string in ISO8601 format.

	 * 

	 * @return	Parsed date (expressed in milliseconds from the 1st January 1970 ;
@@ -400,7 +414,7 @@ public class ISO8601Format { 
	 * 

	 * @throws ParseException	If the given date is not expressed in ISO8601 format or is not merely parseable with this implementation.

	 */

	public static long parse(final String strDate) throws ParseException{

	public static synchronized long parse(final String strDate) throws ParseException{

		Matcher m = ISO8601_PATTERN.matcher(strDate);

		if (m.matches()){

			GregorianCalendar cal = new GregorianCalendar();