--- old/src/java.desktop/share/classes/java/awt/Component.java	2019-11-06 01:41:26.055686200 -0800
+++ new/src/java.desktop/share/classes/java/awt/Component.java	2019-11-06 01:41:25.733622100 -0800
@@ -2972,8 +2972,7 @@
             if (!wasValid && peer != null) {
                 Font newfont = getFont();
                 Font oldfont = peerFont;
-                if (newfont != oldfont && (oldfont == null
-                                           || !oldfont.equals(newfont))) {
+                if (newfont != null && !Objects.equals(oldfont, newfont)) {
                     peer.setFont(newfont);
                     peerFont = newfont;
                 }