Skip to content
Permalink
Browse files
8249215: JFrame::setVisible crashed with -Dfile.encoding=UTF-8 on Jap…
…anese Windows.

Backport-of: e15e30f
  • Loading branch information
Yuri Nesterenko committed Feb 1, 2021
1 parent 3678a7b commit 7a3ce726db3430a6ab33d9b79226d05e7359a5bd
Showing with 7 additions and 3 deletions.
  1. +7 −3 src/java.desktop/windows/classes/sun/awt/windows/WFontConfiguration.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -152,14 +152,18 @@ protected String getFileNameFromComponentFontName(String componentFontName) {

/**
* Returns the component font name (face name plus charset) of the
* font that should be used for AWT text components. May return null.
* font that should be used for AWT text components.
*/
public String getTextComponentFontName(String familyName, int style) {
FontDescriptor[] fontDescriptors = getFontDescriptors(familyName, style);
String fontName = findFontWithCharset(fontDescriptors, textInputCharset);
if (fontName == null) {
if ((fontName == null) && !textInputCharset.equals("DEFAULT_CHARSET")) {
fontName = findFontWithCharset(fontDescriptors, "DEFAULT_CHARSET");
}
if (fontName == null) {
fontName = (fontDescriptors.length > 0) ? fontDescriptors[0].getNativeName()
: "Arial,ANSI_CHARSET";
}
return fontName;
}

1 comment on commit 7a3ce72

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 7a3ce72 Feb 1, 2021

Please sign in to comment.