JBR-6764: Add null check on hostAdapterLocator

JetBrains · Jun 14, 2024 · ce21a7a · ce21a7a
1 parent 1a58e7f
commit ce21a7a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java b/src/java.desktop/share/classes/sun/awt/im/ExecutableInputMethodManager.java
@@ -415,7 +415,7 @@ InputMethodLocator findInputMethod(Locale locale) {
         }
 
         // Workaround for JBR-6764
-        if (FontUtilities.isMacOSX) {
+        if (hostAdapterLocator != null && FontUtilities.isMacOSX) {
             return hostAdapterLocator.deriveLocator(locale);
         }