Skip to content

Commit

Permalink
8327486: java/util/Properties/PropertiesStoreTest.java fails "Text 'x…
Browse files Browse the repository at this point in the history 
…xx' could not be parsed at index 20" after 8174269

Reviewed-by: naoto
  • Loading branch information
@DamonFool
SendaoYan authored and DamonFool committed Mar 12, 2024
1 parent 4d6235e commit e21da4c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions test/jdk/java/util/Properties/PropertiesStoreTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -55,9 +55,9 @@
public class PropertiesStoreTest {

private static final String DATE_FORMAT_PATTERN = "EEE MMM dd HH:mm:ss zzz uuuu";
// use a neutral locale, since when the date comment was written by Properties.store(...),
// it internally calls the Date.toString() which always writes in a locale insensitive manner
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern(DATE_FORMAT_PATTERN, Locale.ROOT);
// use Locale.US, since when the date comment was written by Properties.store(...),
// it internally calls the Date.toString() which uses Locale.US for time zone names
private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern(DATE_FORMAT_PATTERN, Locale.US);
private static final Locale PREV_LOCALE = Locale.getDefault();

@DataProvider(name = "propsProvider")
Expand Down

3 comments on commit e21da4c

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on e21da4c Apr 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on e21da4c Apr 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch backport-GoeLin-e21da4ca in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e21da4ca from the openjdk/jdk repository.

The commit being backported was authored by SendaoYan on 12 Mar 2024 and was reviewed by Naoto Sato.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-e21da4ca:backport-GoeLin-e21da4ca
$ git checkout backport-GoeLin-e21da4ca
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-GoeLin-e21da4ca

Please sign in to comment.