From d5a0e4cfceb94b578cd5f5d2c12e13ef62637871 Mon Sep 17 00:00:00 2001
From: prr <none@none>
Date: Fri, 14 Jun 2019 20:33:17 -0700
Subject: [PATCH] 8224915: Better serial attributes Reviewed-by: serb,
 psadhukhan, mschoene, rhalade

---
 src/share/classes/java/awt/Font.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/share/classes/java/awt/Font.java b/src/share/classes/java/awt/Font.java
index 3293932f2..b62c83839 100644
--- a/src/share/classes/java/awt/Font.java
+++ b/src/share/classes/java/awt/Font.java
@@ -1750,6 +1750,7 @@ public class Font implements java.io.Serializable
         // value is the default.
 
         if (fRequestedAttributes != null) {
+            try {
             values = getAttributeValues(); // init
             AttributeValues extras =
                 AttributeValues.fromSerializableHashtable(fRequestedAttributes);
@@ -1759,10 +1760,13 @@ public class Font implements java.io.Serializable
             values = getAttributeValues().merge(extras);
             this.nonIdentityTx = values.anyNonDefault(EXTRA_MASK);
             this.hasLayoutAttributes =  values.anyNonDefault(LAYOUT_MASK);
-
+            } catch (Throwable t) {
+                throw new IOException(t);
+            } finally {
             fRequestedAttributes = null; // don't need it any more
         }
     }
+    }
 
     /**
      * Returns the number of glyphs in this <code>Font</code>. Glyph codes
-- 
GitLab