diff --git a/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java b/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java index f33b4260907f..d530a7cdc98b 100644 --- a/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java +++ b/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java @@ -401,7 +401,7 @@ class ExecutableInputMethodManager extends InputMethodManager } // Workaround for JBR-6764 - if (FontUtilities.isMacOSX) { + if (hostAdapterLocator != null && FontUtilities.isMacOSX) { return hostAdapterLocator.deriveLocator(locale); }