Skip to content

Commit bf81192

Browse files
authored
Merge pull request #496 from DenverM80/bpb100_date_locale_3.5
Force US locale for compatibility with English BP server
2 parents 53242e9 + 64783ac commit bf81192

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

ds3-sdk/src/main/java/com/spectralogic/ds3client/networking/NetworkClientImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private String buildPath() {
271271

272272
private void addHeaders(final HttpRequest httpRequest) {
273273
// Add common headers.
274-
final String date = DateFormatter.dateToRfc882();
274+
final String date = DateFormatter.dateToRfc822();
275275
httpRequest.addHeader(HOST, NetUtils.buildHostField(NetworkClientImpl.this.connectionDetails));
276276
httpRequest.addHeader(DATE, date);
277277
httpRequest.addHeader(CONTENT_TYPE, this.ds3Request.getContentType());

ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/DateFormatter.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@
1717

1818
import java.text.SimpleDateFormat;
1919
import java.util.Date;
20+
import java.util.Locale;
2021
import java.util.TimeZone;
2122

2223
public final class DateFormatter {
2324
final static private String RFC822FORMAT = "EEE, dd MMM yyyy HH:mm:ss Z";
2425
/**
25-
* Returns a RFC-882 formatted string with the current time.
26+
* Returns a RFC-822 formatted string with the current time.
2627
*/
27-
public static String dateToRfc882() {
28-
return dateToRfc882(new Date());
28+
public static String dateToRfc822() {
29+
return dateToRfc822(new Date());
2930
}
3031

31-
public static String dateToRfc882(final Date date) {
32-
final SimpleDateFormat sdf = new SimpleDateFormat(RFC822FORMAT);
32+
public static String dateToRfc822(final Date date) {
33+
final SimpleDateFormat sdf = new SimpleDateFormat(RFC822FORMAT, Locale.US);
3334
sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
3435
return sdf.format(date);
3536
}

ds3-sdk/src/test/java/com/spectralogic/ds3client/utils/DateFormatter_Test.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.junit.Test;
2020

2121
import java.util.Date;
22+
import java.util.Locale;
2223

2324
import static org.hamcrest.CoreMatchers.is;
2425
import static org.hamcrest.MatcherAssert.assertThat;
@@ -29,6 +30,16 @@ public class DateFormatter_Test {
2930
public void formatDate() {
3031
final Date date = new Date(1390414308132L);
3132

32-
assertThat(DateFormatter.dateToRfc882(date), is("Wed, 22 Jan 2014 18:11:48 +0000"));
33+
assertThat(DateFormatter.dateToRfc822(date), is("Wed, 22 Jan 2014 18:11:48 +0000"));
34+
}
35+
36+
@Test
37+
public void formatDateMandarin() {
38+
final Locale defaultLocale = Locale.getDefault();
39+
Locale.setDefault(Locale.CHINESE);
40+
final Date date = new Date(1390414308132L);
41+
42+
assertThat(DateFormatter.dateToRfc822(date), is("Wed, 22 Jan 2014 18:11:48 +0000"));
43+
Locale.setDefault(defaultLocale);
3344
}
3445
}

0 commit comments

Comments
 (0)