From 09db90e3d1163da4e92a70e8278876ef2c1d50c8 Mon Sep 17 00:00:00 2001
From: Andrew Brygin <bae@openjdk.org>
Date: Thu, 2 Jun 2016 15:36:15 +0300
Subject: [PATCH] 8078382: Wrong glyph is displayed for a derived font

Reviewed-by: prr, serb
---
 jdk/src/java.desktop/share/classes/sun/font/FontFamily.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontFamily.java b/jdk/src/java.desktop/share/classes/sun/font/FontFamily.java
index b8092abf3a9..7b6cac69765 100644
--- a/jdk/src/java.desktop/share/classes/sun/font/FontFamily.java
+++ b/jdk/src/java.desktop/share/classes/sun/font/FontFamily.java
@@ -335,9 +335,9 @@ public class FontFamily {
         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;