Skip to content

Commit 6ea996c

Browse files
author
Ichiroh Takiguchi
committed
8282422: JTable.print() failed with UnsupportedCharsetException on AIX ko_KR locale
Reviewed-by: prr, serb
1 parent 8cc1235 commit 6ea996c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/java.desktop/share/classes/sun/awt/FontConfiguration.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -960,7 +960,9 @@ private CharsetEncoder getFontCharsetEncoder(final String charsetName,
960960
return fc.newEncoder();
961961
}
962962

963-
if (!charsetName.startsWith("sun.awt.") && !charsetName.equals("default")) {
963+
if (!charsetName.startsWith("sun.awt.") &&
964+
!charsetName.equals("default") &&
965+
!charsetName.startsWith("sun.font.")) {
964966
fc = Charset.forName(charsetName);
965967
} else {
966968
@SuppressWarnings("removal")

0 commit comments

Comments
 (0)