Skip to content

Commit 6faebb1

Browse files
author
Ichiroh Takiguchi
committed
8282422: JTable.print() failed with UnsupportedCharsetException on AIX ko_KR locale
Backport-of: 6ea996c20591cafa9673d9c697437ce2c48e4616
1 parent 22fc6ce commit 6faebb1

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, 2014, 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
@@ -964,7 +964,9 @@ private CharsetEncoder getFontCharsetEncoder(final String charsetName,
964964
return fc.newEncoder();
965965
}
966966

967-
if (!charsetName.startsWith("sun.awt.") && !charsetName.equals("default")) {
967+
if (!charsetName.startsWith("sun.awt.") &&
968+
!charsetName.equals("default") &&
969+
!charsetName.startsWith("sun.font.")) {
968970
fc = Charset.forName(charsetName);
969971
} else {
970972
Class<?> fcc = AccessController.doPrivileged(new PrivilegedAction<Class<?>>() {

0 commit comments

Comments
 (0)