8288329: Avoid redundant TreeMap.containsKey call in PolicyParser.read

[turbanoff]

Instead of pair TreeMap.containsKey/TreeMap.put method calls, we can use single call TreeMap.putIfAbsent and check result for nullness.
Only non-null values are put into Map<String, DomainEntry> domainEntries.

jdk/src/java.base/share/classes/sun/security/provider/PolicyParser.java

Lines 205 to 214 in 53a0ace

	if (!domainEntries.containsKey(domainName)) {
	domainEntries.put(domainName, de);
	} else {
	LocalizedMessage localizedMsg = new LocalizedMessage(
	"duplicate.keystore.domain.name");
	Object[] source = {domainName};
	String msg = "duplicate keystore domain name: " +
	domainName;
	throw new ParsingException(msg, localizedMsg, source);
	}

---

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-8288329: Avoid redundant TreeMap.containsKey call in PolicyParser.read

Reviewers

• Sean Mullan (@seanjmullan - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8486

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

Using diff file

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

[bridgekeeper]

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

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

• security

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.

[bridgekeeper]

@turbanoff This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[mlbridge]

Webrevs

• 00: Full (f35f71ec)

[seanjmullan]

Looks good, but please add an appropriate noreg label to the bug.

[openjdk]

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

8288329: Avoid redundant TreeMap.containsKey call in PolicyParser.read

Reviewed-by: mullan

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

• 6633855: 8288399: MacOS debug symbol files not always deterministic in reproducible builds
• d5cd2f2: 8284849: Add deoptimization to unified logging
• dfeeb6f: 8288140: Avoid redundant Hashtable.get call in Signal.handle
• 68b2057: 8287373: remove unnecessary paddings in generated code
• 2471f8f: 8287647: VM debug support: find node by pattern in name or dump
• 33f34d5: 8288207: Enhance MalformedURLException in Uri.parseCompat
• 444a0d9: 8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist
• 08400f1: 8287349: AArch64: Merge LDR instructions to improve C1 OSR performance
• fe80721: 8287917: System.loadLibrary does not work on Big Sur if JDK is built with macOS SDK 10.15 and earlier
• bbaeacb: 8265586: [windows] last button is not shown in AWT Frame with BorderLayout and MenuBar set.
• ... and 671 more: https://git.openjdk.org/jdk/compare/d9541c5e9f68f2b76e6e1d09bc24750b7c9a5b5b...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.

[turbanoff]

/integrate

[openjdk]

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

• f62b2bd: 8288480: IGV: toolbar action is not applied to the focused graph
• 02da5f9: 8263384: IGV: Outline should highlight the Graph that has focus
• 7d4df6a: 8284404: Too aggressive sweeping with Loom
• 47b8669: 8288573: Make Executable.getParameterCount() actually abstract
• af64d31: Merge
• 53bf1bf: 8286176: Add JNI_VERSION_19 to jni.h and JNI spec
• c254c9d: 8287401: jpackage tests failing on Windows due to powershell issue
• ff3db52: 8288534: Out of bound errors for memory segment access mentions wrong values
• cc44592: 8287904: Reduce runtime of java.net microbenchmarks
• 523d553: 8282777: Create a Regression test for JDK-4515031
• ... and 711 more: https://git.openjdk.org/jdk/compare/d9541c5e9f68f2b76e6e1d09bc24750b7c9a5b5b...master

Your commit was automatically rebased without conflicts.

[openjdk]

@turbanoff Pushed as commit 7acdcc1.

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