Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8327486: java/util/Properties/PropertiesStoreTest.java fails "Text 'xxx' could not be parsed at index 20" after 8174269 #18155

Closed
wants to merge 3 commits into from
Closed

8327486: java/util/Properties/PropertiesStoreTest.java fails "Text 'xxx' could not be parsed at index 20" after 8174269 #18155

wants to merge 3 commits into from

Conversation

sendaoYan
Copy link
Member

@sendaoYan sendaoYan commented Mar 7, 2024 •
edited by openjdk bot
Loading

Date.toString() uses Locale.US explicitly for printing the time zone, so replace Locale.ROOT to Locale.US in this testcase for fix the test failure.

This testcase fixed has been verified.

Only change the testcase, risk is low.

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8327486: java/util/Properties/PropertiesStoreTest.java fails "Text 'xxx' could not be parsed at index 20" after 8174269 (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/18155/head:pull/18155
$ git checkout pull/18155

Update a local copy of the PR:
$ git checkout pull/18155
$ git pull https://git.openjdk.org/jdk.git pull/18155/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18155

View PR using the GUI difftool:
$ git pr show -t 18155

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/18155.diff

Webrev

Link to Webrev Comment

@sendaoYan
8327486: java/util/Properties/PropertiesStoreTest.java fails "Text 'x…
7d8c010 
…xx' could not be parsed at index 20" after 8174269

The DATE_FORMAT_PATTERN is set to "EEE MMM dd HH:mm:ss zzz uuuu", is the time format of US. So, creates a formatter should using Locale.US, rather than Locale.ROOT, i.e empty.

Signed-off-by: sendaoYan <yansendao.ysd@alibaba-inc.com>
@bridgekeeper
Copy link

bridgekeeper bot commented Mar 7, 2024

👋 Welcome back syan! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 7, 2024
@openjdk
Copy link

openjdk bot commented Mar 7, 2024

@sendaoYan The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Mar 7, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 7, 2024 •
edited
Loading

Webrevs

naotoj
naotoj reviewed Mar 7, 2024
View reviewed changes
Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

Thanks for the fix. Although setting Locale.US to acquire the formatter is correct, the reasoning is not. The real reason is that Date.toString() uses Locale.US explicitly for printing the time zone

jdk/src/java.base/share/classes/java/util/Date.java

Line 1045 in 972e81d

sb.append(zi.getDisplayName(date.isDaylightTime(), TimeZone.SHORT, Locale.US)); // zzz

Also, update the copyright year to 2024.

test/jdk/java/util/Properties/PropertiesStoreTest.java Outdated Show resolved Hide resolved
@sendaoYan
Copy link
Member Author

Thanks for the fix. Although setting Locale.US to acquire the formatter is correct, the reasoning is not. The real reason is that Date.toString() uses Locale.US explicitly for printing the time zone

jdk/src/java.base/share/classes/java/util/Date.java

Line 1045 in 972e81d

sb.append(zi.getDisplayName(date.isDaylightTime(), TimeZone.SHORT, Locale.US)); // zzz

Also, update the copyright year to 2024.

Done.

@sendaoYan
Copy link
Member Author

GHA: riscv cross compile fail. It's unrelated to this PR.

@sendaoYan
update the Locale.US code comment
1475149 
Signed-off-by: sendaoYan <yansendao.ysd@alibaba-inc.com>
naotoj
naotoj approved these changes Mar 11, 2024
View reviewed changes
Copy link
Member

@naotoj naotoj left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk
Copy link

openjdk bot commented Mar 11, 2024 •
edited
Loading

@sendaoYan This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8327486: java/util/Properties/PropertiesStoreTest.java fails "Text 'xxx' could not be parsed at index 20" after 8174269

Reviewed-by: naoto

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 40 new commits pushed to the master branch:

  • 4d6235e: 8327716: RISC-V: Change type of vector_length param of several assembler functions from int to uint
  • 586396c: 8327705: Remove mention of "applet" from java.text package description
  • 41450e9: 8314250: CDS dump error message: Invoker type parameter must start and end with Object: L3I_L
  • 0a6e64e: 8327424: ProblemList serviceability/sa/TestJmapCore.java on all platforms with ZGC
  • c65d308: 8327812: JFR: Remove debug message in Function.Maximum
  • b9bc31f: 8327790: Improve javadoc for ResolvedJavaType.hasFinalizableSubclass
  • 18de932: 8325991: Accelerate Poly1305 on x86_64 using AVX2 instructions
  • d74b907: 8327093: Add truncate function to BitMap API
  • ffd43c9: 8327461: KeyStore getEntry is not thread-safe
  • 680ac2c: 8327689: RISC-V: adjust test filters of zfh extension
  • ... and 30 more: https://git.openjdk.org/jdk/compare/784f11c35d7f8646c7354c756ac8801a3d685874...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@naotoj) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 11, 2024
@sendaoYan
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 12, 2024
@openjdk
Copy link

openjdk bot commented Mar 12, 2024

@sendaoYan
Your change (at version 1475149) is now ready to be sponsored by a Committer.

@sendaoYan
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 12, 2024

@sendaoYan
Your change (at version 1475149) is now ready to be sponsored by a Committer.

@DamonFool
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 12, 2024

Going to push as commit e21da4c.
Since your change was applied there have been 40 commits pushed to the master branch:

  • 4d6235e: 8327716: RISC-V: Change type of vector_length param of several assembler functions from int to uint
  • 586396c: 8327705: Remove mention of "applet" from java.text package description
  • 41450e9: 8314250: CDS dump error message: Invoker type parameter must start and end with Object: L3I_L
  • 0a6e64e: 8327424: ProblemList serviceability/sa/TestJmapCore.java on all platforms with ZGC
  • c65d308: 8327812: JFR: Remove debug message in Function.Maximum
  • b9bc31f: 8327790: Improve javadoc for ResolvedJavaType.hasFinalizableSubclass
  • 18de932: 8325991: Accelerate Poly1305 on x86_64 using AVX2 instructions
  • d74b907: 8327093: Add truncate function to BitMap API
  • ffd43c9: 8327461: KeyStore getEntry is not thread-safe
  • 680ac2c: 8327689: RISC-V: adjust test filters of zfh extension
  • ... and 30 more: https://git.openjdk.org/jdk/compare/784f11c35d7f8646c7354c756ac8801a3d685874...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 12, 2024
@openjdk openjdk bot closed this Mar 12, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Mar 12, 2024
@openjdk
Copy link

openjdk bot commented Mar 12, 2024

@DamonFool @sendaoYan Pushed as commit e21da4c.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@sendaoYan sendaoYan deleted the jbs8327486 branch March 12, 2024 01:40
@sendaoYan
Copy link
Member Author

LGTM

@naotoj Thanks for the review.

@sendaoYan
Copy link
Member Author

/sponsor

@DamonFool Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@naotoj naotoj naotoj approved these changes

Assignees
No one assigned
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sendaoYan @DamonFool @naotoj