8170950: Text is displayed in bold when fonts are installed into symlinked folder

Reviewed-by: prr, serb
This commit is contained in:
Dmitry Batrak 2017-02-14 00:09:32 +03:00
parent eca7a98977
commit 2a3c0587b6

View File

@ -27,6 +27,7 @@ package sun.font;
import java.io.File;
import java.awt.Font;
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
@ -132,6 +133,16 @@ public class FontFamily {
FileFont newFont = (FileFont)font;
File newDir = (new File(newFont.platName)).getParentFile();
if (existDir != null) {
try {
existDir = existDir.getCanonicalFile();
} catch (IOException ignored) {}
}
if (newDir != null) {
try {
newDir = newDir.getCanonicalFile();
} catch (IOException ignored) {}
}
return java.util.Objects.equals(newDir, existDir);
}