infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8368882: NPE during text drawing on machine with JP locale

Browse Source 
Reviewed-by: serb, prr, psadhukhan
This commit is contained in:
Sergey Nazarkin 2025-11-03 12:56:42 +00:00 committed by Dmitry Cherepanov
parent 6f452ac46f
commit 4520983e8e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java.desktop/share/classes/sun/font/CompositeFont.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2025, 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
@ -88,7 +88,7 @@ public final class CompositeFont extends Font2D {
/*
* See if this is a windows locale which has a system EUDC font.
* If so add it as the final fallback component of the composite.
* If so add it as the first fallback component of the composite.
* The caller could be responsible for this, but for now it seems
* better that it is handled internally to the CompositeFont class.
*/
@ -114,8 +114,8 @@ public final class CompositeFont extends Font2D {
components[msCnt] = fm.getEUDCFont();
deferredInitialisation = new boolean[numSlots];
if (defer) {
for (int i=0; i<numSlots-1; i++) {
deferredInitialisation[i] = true;
for (int i = 0; i < numSlots; i++) {
deferredInitialisation[i] = (i != msCnt);
}
}
} else {