Skip to content

Commit 0e2cc22

Browse files
author
duke
committed
Backport 4520983e8e5fcfb22e04508d50676df6831fa636
1 parent 89c5659 commit 0e2cc22

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/java.desktop/share/classes/sun/font/CompositeFont.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2025, 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
@@ -88,7 +88,7 @@ public CompositeFont(String name, String[] compFileNames,
8888

8989
/*
9090
* See if this is a windows locale which has a system EUDC font.
91-
* If so add it as the final fallback component of the composite.
91+
* If so add it as the first fallback component of the composite.
9292
* The caller could be responsible for this, but for now it seems
9393
* better that it is handled internally to the CompositeFont class.
9494
*/
@@ -114,8 +114,8 @@ public CompositeFont(String name, String[] compFileNames,
114114
components[msCnt] = fm.getEUDCFont();
115115
deferredInitialisation = new boolean[numSlots];
116116
if (defer) {
117-
for (int i=0; i<numSlots-1; i++) {
118-
deferredInitialisation[i] = true;
117+
for (int i = 0; i < numSlots; i++) {
118+
deferredInitialisation[i] = (i != msCnt);
119119
}
120120
}
121121
} else {

0 commit comments

Comments
 (0)