use LinkedHashMap instead of HashMap

Only store the pointer to the utf8 string if its creation was successful
openjdk · Jun 12, 2020 · 0d6e909 · 0d6e909
1 parent 998f55c
commit 0d6e909
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/PangoGlyphLayout.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/PangoGlyphLayout.java
@@ -35,7 +35,7 @@
 import com.sun.javafx.text.TextRun;
 
 import java.util.Arrays;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 class PangoGlyphLayout extends GlyphLayout {
@@ -84,7 +84,7 @@ private boolean check(long checkValue, String message, long context, long desc,
         return true;
     }
 
-    private Map<TextRun, Long> runUtf8 = new HashMap<>();
+    private Map<TextRun, Long> runUtf8 = new LinkedHashMap<>();
     public void layout(TextRun run, PGFont font, FontStrike strike, char[] text) {
         /* Create the pango font and attribute list */
         FontResource fr = font.getFontResource();
@@ -133,10 +133,10 @@ public void layout(TextRun run, PGFont font, FontStrike strike, char[] text) {
         if (str == null) {
             char[] rtext = Arrays.copyOfRange(text, run.getStart(), run.getEnd());
             str = OSPango.g_utf16_to_utf8(rtext);
-            runUtf8.put(run, str);
             if (check(str, "Failed allocating UTF-8 buffer.", context, desc, attrList)) {
                 return;
             }
+            runUtf8.put(run, str);
         }
 
         /* Itemize */