From e0ca831cf202945bd9b60576af6907a73b7d7842 Mon Sep 17 00:00:00 2001
From: John Erik Halse <johnerikhalse@gmail.com>
Date: Thu, 7 Aug 2014 10:19:56 +0200
Subject: [PATCH] Explicitly setting locale for dateformats

---
 .../org/archive/format/gzip/zipnum/ZipNumCluster.java     | 3 ++-
 src/main/java/org/archive/util/ArchiveUtils.java          | 8 ++++----
 src/main/java/org/archive/util/DateUtils.java             | 2 +-
 .../util/binsearch/impl/http/ApacheHttp31SLRFactory.java  | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/archive/format/gzip/zipnum/ZipNumCluster.java b/src/main/java/org/archive/format/gzip/zipnum/ZipNumCluster.java
index bc773a58..a3d34a4b 100644
--- a/src/main/java/org/archive/format/gzip/zipnum/ZipNumCluster.java
+++ b/src/main/java/org/archive/format/gzip/zipnum/ZipNumCluster.java
@@ -21,6 +21,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
@@ -102,7 +103,7 @@ public void run() {
 	public final static String LATEST_TIMESTAMP = "_LATEST";	
 	public final static String OFF = "OFF";
 	
-	protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ENGLISH);
 	protected Date startDate, endDate;
 	
 	class BlockSize
diff --git a/src/main/java/org/archive/util/ArchiveUtils.java b/src/main/java/org/archive/util/ArchiveUtils.java
index c41c0bc0..e4224384 100644
--- a/src/main/java/org/archive/util/ArchiveUtils.java
+++ b/src/main/java/org/archive/util/ArchiveUtils.java
@@ -104,7 +104,7 @@ public class ArchiveUtils {
     private static ThreadLocal<SimpleDateFormat> threadLocalDateFormat(final String pattern) {
         ThreadLocal<SimpleDateFormat> tl = new ThreadLocal<SimpleDateFormat>() {
             protected SimpleDateFormat initialValue() {
-                SimpleDateFormat df = new SimpleDateFormat(pattern);
+                SimpleDateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
                 df.setTimeZone(TimeZone.getTimeZone("GMT"));
                 return df;
             }
@@ -393,9 +393,9 @@ public static Date getDate(String d) throws ParseException {
     }
     
     final static SimpleDateFormat dateToTimestampFormats[] = 
-          {new SimpleDateFormat("MM/dd/yyyy"), 
-		   new SimpleDateFormat("MM/yyyy"), 
-		   new SimpleDateFormat("yyyy")};
+          {new SimpleDateFormat("MM/dd/yyyy", Locale.ENGLISH),
+		   new SimpleDateFormat("MM/yyyy", Locale.ENGLISH),
+		   new SimpleDateFormat("yyyy", Locale.ENGLISH)};
 
     /**
      * Convert a user-entered date into a timestamp
diff --git a/src/main/java/org/archive/util/DateUtils.java b/src/main/java/org/archive/util/DateUtils.java
index e7fe78b7..d01b63ce 100755
--- a/src/main/java/org/archive/util/DateUtils.java
+++ b/src/main/java/org/archive/util/DateUtils.java
@@ -65,7 +65,7 @@ public class DateUtils {
     private static ThreadLocal<SimpleDateFormat> threadLocalDateFormat(final String pattern) {
         ThreadLocal<SimpleDateFormat> tl = new ThreadLocal<SimpleDateFormat>() {
             protected SimpleDateFormat initialValue() {
-                SimpleDateFormat df = new SimpleDateFormat(pattern);
+                SimpleDateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
                 df.setTimeZone(TimeZone.getTimeZone("GMT"));
                 return df;
             }
diff --git a/src/main/java/org/archive/util/binsearch/impl/http/ApacheHttp31SLRFactory.java b/src/main/java/org/archive/util/binsearch/impl/http/ApacheHttp31SLRFactory.java
index 9bd7542b..bc5b83f4 100644
--- a/src/main/java/org/archive/util/binsearch/impl/http/ApacheHttp31SLRFactory.java
+++ b/src/main/java/org/archive/util/binsearch/impl/http/ApacheHttp31SLRFactory.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 import java.util.logging.Logger;
 
 import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
@@ -156,7 +157,7 @@ public boolean isStaleChecking()
 	public long getModTime()
 	{
 		HTTPSeekableLineReader reader = null;
-		SimpleDateFormat lastModFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz");
+		SimpleDateFormat lastModFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.ENGLISH);
 	
 		try {
 			reader = get();