8356843: Avoid redundant HashMap.get to obtain old value in Toolkit.setDesktopProperty

Andrey Turbanov · Andrey Turbanov · commit e557b6956bdf · 2025-05-15T07:57:14.000Z
Reviewed-by: aivanov, serb
diff --git a/src/java.desktop/share/classes/java/awt/Toolkit.java b/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2025, 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
@@ -1472,8 +1472,7 @@ protected final void setDesktopProperty(String name, Object newValue) {
         Object oldValue;
 
         synchronized (this) {
-            oldValue = desktopProperties.get(name);
-            desktopProperties.put(name, newValue);
+            oldValue = desktopProperties.put(name, newValue);
         }
 
         // Don't fire change event if old and new values are null.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 1995, 2025, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -1472,8 +1472,7 @@ protected final void setDesktopProperty(String name, Object newValue) {`
`1472`	`1472`	`Object oldValue;`
`1473`	`1473`
`1474`	`1474`	`synchronized (this) {`
`1475`		`- oldValue = desktopProperties.get(name);`
`1476`		`- desktopProperties.put(name, newValue);`
	`1475`	`+ oldValue = desktopProperties.put(name, newValue);`
`1477`	`1476`	`}`
`1478`	`1477`
`1479`	`1478`	`// Don't fire change event if old and new values are null.`