From fd1bb078ea3c8d3a10be696384ecf04d16573baa Mon Sep 17 00:00:00 2001
From: Andrey Turbanov <aturbanov@openjdk.org>
Date: Tue, 5 Jul 2022 07:39:05 +0000
Subject: [PATCH] 8287603: Avoid redundant HashMap.containsKey calls in
 NimbusDefaults.getDerivedColor

Reviewed-by: attila, aivanov
---
 .../classes/javax/swing/plaf/nimbus/Defaults.template     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Defaults.template b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Defaults.template
index b0b78b554f9..6507d6cd8d0 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Defaults.template
+++ b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/Defaults.template
@@ -680,7 +680,7 @@ ${UI_DEFAULT_INIT}
      * Get a derived color, derived colors are shared instances and will be
      * updated when its parent UIDefault color changes.
      *
-     * @param uiDefaultParentName The parent UIDefault key
+     * @param parentUin The parent UIDefault key
      * @param hOffset The hue offset
      * @param sOffset The saturation offset
      * @param bOffset The brightness offset
@@ -710,10 +710,10 @@ ${UI_DEFAULT_INIT}
                 bOffset, aOffset);
         }
 
-        if (derivedColors.containsKey(color)) {
-            return derivedColors.get(color);
+        DerivedColor prev = derivedColors.putIfAbsent(color, color);
+        if (prev != null) {
+            return prev;
         } else {
-            derivedColors.put(color, color);
             color.rederiveColor(); /// move to ARP.decodeColor() ?
             colorTree.addColor(uin, color);
             return color;