commit 4b595446e87daf3661013fe6c8f6bc152fb2e94a
author Andrew Brygin <bae@openjdk.org> Fri Jun 03 12:46:32 2016 +0300
committer Andrew Brygin <bae@openjdk.org> Fri Jun 03 12:46:32 2016 +0300
tree 6914f02b5cdbf7b52465b9659e5e6d82934ebe7a
parent e5fefec1fe9dd5d35ae4728c03b6749706c4ca40

8078382: Wrong glyph is displayed for a derived font

Reviewed-by: prr, serb

jdk/src/share/classes/sun/font/FontFamily.java

diff --git a/jdk/src/share/classes/sun/font/FontFamily.java b/jdk/src/share/classes/sun/font/FontFamily.java
index 31f1425..e319886 100644
--- a/jdk/src/share/classes/sun/font/FontFamily.java
+++ b/jdk/src/share/classes/sun/font/FontFamily.java
@@ -335,9 +335,9 @@
         case Font.BOLD|Font.ITALIC:
             if (bolditalic != null) {
                 return bolditalic;
-            } else if (italic != null && italic.canDoStyle(style)) {
-                    return italic;
             } else if (bold != null && bold.canDoStyle(style)) {
+                return bold;
+            } else if (italic != null && italic.canDoStyle(style)) {
                     return italic;
             } else if (plain != null && plain.canDoStyle(style)) {
                     return plain;