Re: [OpenJDK 2D-Dev] RFR: 8134986: Incorrect use of ConcurrentHashMap.contains in SunFontManager.java

[Sergey Bylokhov]

Looks fine.

On 05.04.16 1:33, Phil Race wrote:

https://bugs.openjdk.java.net/browse/JDK-8134986

When converted from a HashSet to a HashMap contains() should have
changed to containsKey(). It does not lead to duplicate fonts because
it is caught later on but it might lead to wasted work

One line fix in line below

diff --git a/src/java.desktop/share/classes/sun/font/SunFontManager.java
b/src/java.desktop/share/classes/sun/font/SunFontManager.java
--- a/src/java.desktop/share/classes/sun/font/SunFontManager.java
+++ b/src/java.desktop/share/classes/sun/font/SunFontManager.java
@@ -1843,7 +1843,7 @@

      private PhysicalFont registerFontFile(String file) {
          if (new File(file).isAbsolute() &&
-            !registeredFonts.contains(file)) {
+            !registeredFonts.containsKey(file)) {
              int fontFormat = FONTFORMAT_NONE;
              int fontRank = Font2D.UNKNOWN_RANK;
              if (ttFilter.accept(null, file)) {


-phil.

--
Best regards, Sergey.