8290162: Reset recursion counter missed in fix of JDK-8224267

[prsadhuk]

recursionCount counter added in fix of JDK-8224267 is only reset when limit is reached, so it will behave incorrectly if JOptionPane.showMessageDialog continuously with the same message having newlines, so it needs to be reset also at appropriate location.
Fix to reset the counter before the recursive method is called.

Also, fix added to indicate the original message is truncated by adding ... (ellipsis) to the previous line of text if it recurses more than limit set.

---

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-8290162: Reset recursion counter missed in fix of JDK-8224267

Reviewers

• Phil Race (@prrace - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9464

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

Using diff file

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

[bridgekeeper]

👋 Welcome back psadhukhan! 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]

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

• client

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.

[mlbridge]

Webrevs

• 00: Full (992a01d7)

[openjdk]

@prsadhuk 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:

8290162: Reset recursion counter missed in fix of JDK-8224267

Reviewed-by: prr

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 39 new commits pushed to the master branch:

• 31f7fc0: 8283082: sun.security.x509.X509CertImpl.delete("x509.info.validity") nulls out info field
• d9ca438: Merge
• 3164c98: 8289148: j.l.foreign.VaList::nextVarg call could throw IndexOutOfBoundsException or even crash the VM
• c3806b9: 8289709: fatal error: stuck in JvmtiVTMSTransitionDisabler::disable_VTMS_transitions
• 39715f3: 8287902: UnreadableRB case in MissingResourceCauseTest is not working reliably on Windows
• 62fbc3f: 8287379: Using @inheritdoc in an inapplicable context shouldn't crash javadoc
• fed3af8: 8287809: Revisit implementation of memory session
• e8568b8: 8290020: Deadlock in leakprofiler::emit_events during shutdown
• 7f0e9bd: 8289745: JfrStructCopyFailed uses heap words instead of bytes for object sizes
• 728157f: 8289917: Metadata for regionsRefilled of G1EvacuationStatistics event is wrong
• ... and 29 more: https://git.openjdk.org/jdk/compare/46251bc6e248a19e8d78173ff8d0502c68ee1acb...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[prsadhuk]

/integrate

[openjdk]

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

• 31f7fc0: 8283082: sun.security.x509.X509CertImpl.delete("x509.info.validity") nulls out info field
• d9ca438: Merge
• 3164c98: 8289148: j.l.foreign.VaList::nextVarg call could throw IndexOutOfBoundsException or even crash the VM
• c3806b9: 8289709: fatal error: stuck in JvmtiVTMSTransitionDisabler::disable_VTMS_transitions
• 39715f3: 8287902: UnreadableRB case in MissingResourceCauseTest is not working reliably on Windows
• 62fbc3f: 8287379: Using @inheritdoc in an inapplicable context shouldn't crash javadoc
• fed3af8: 8287809: Revisit implementation of memory session
• e8568b8: 8290020: Deadlock in leakprofiler::emit_events during shutdown
• 7f0e9bd: 8289745: JfrStructCopyFailed uses heap words instead of bytes for object sizes
• 728157f: 8289917: Metadata for regionsRefilled of G1EvacuationStatistics event is wrong
• ... and 29 more: https://git.openjdk.org/jdk/compare/46251bc6e248a19e8d78173ff8d0502c68ee1acb...master

Your commit was automatically rebased without conflicts.

[openjdk]

@prsadhuk Pushed as commit 6e18883.

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

[turbanoff]

Hm. What was the reason to use new String constructor here? Is it some security issue?
Seems redundant to me.