stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8224915: Better serial attributes

Browse Source 
Reviewed-by: serb, psadhukhan, mschoene, rhalade
This commit is contained in:
Phil Race 2019-06-14 20:33:17 -07:00
parent d6304e88e6
commit c2701f73d5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.desktop/share/classes/java/awt/Font.java
View File

@ -1929,6 +1929,7 @@ public class Font implements java.io.Serializable
// value is the default. // value is the default.
if (fRequestedAttributes != null) { if (fRequestedAttributes != null) {
try {
values = getAttributeValues(); // init values = getAttributeValues(); // init
AttributeValues extras = AttributeValues extras =
AttributeValues.fromSerializableHashtable(fRequestedAttributes); AttributeValues.fromSerializableHashtable(fRequestedAttributes);
@ -1938,10 +1939,13 @@ public class Font implements java.io.Serializable
values = getAttributeValues().merge(extras); values = getAttributeValues().merge(extras);
this.nonIdentityTx = values.anyNonDefault(EXTRA_MASK); this.nonIdentityTx = values.anyNonDefault(EXTRA_MASK);
this.hasLayoutAttributes = values.anyNonDefault(LAYOUT_MASK); this.hasLayoutAttributes = values.anyNonDefault(LAYOUT_MASK);
} catch (Throwable t) {
throw new IOException(t);
} finally {
fRequestedAttributes = null; // don't need it any more fRequestedAttributes = null; // don't need it any more
} }
} }
}
/** /**
* Returns the number of glyphs in this {@code Font}. Glyph codes * Returns the number of glyphs in this {@code Font}. Glyph codes