From 0e022cfabffcd1c305b1f36729b397c690d2d42b Mon Sep 17 00:00:00 2001
From: takiguc <takiguc@jp.ibm.com>
Date: Sun, 29 May 2022 09:52:45 +0900
Subject: [PATCH] Backport 6ea996c20591cafa9673d9c697437ce2c48e4616

---
 .../share/classes/sun/awt/FontConfiguration.java            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/awt/FontConfiguration.java b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
index 782b9d25641..0363cced013 100644
--- a/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
+++ b/src/java.desktop/share/classes/sun/awt/FontConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, 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
@@ -963,7 +963,9 @@ private CharsetEncoder getFontCharsetEncoder(final String charsetName,
             return fc.newEncoder();
         }
 
-        if (!charsetName.startsWith("sun.awt.") && !charsetName.equals("default")) {
+        if (!charsetName.startsWith("sun.awt.") &&
+            !charsetName.equals("default") &&
+            !charsetName.startsWith("sun.font.")) {
             fc = Charset.forName(charsetName);
         } else {
             @SuppressWarnings("removal")