From 14c0c19539d2fc131979d8f1e1e68cf686dc7be8 Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Tue, 21 Jan 2020 16:53:01 -0800
Subject: [PATCH] 8224549: Less Blocking Array Queues

Reviewed-by: bchristi, rhalade, rriggs, mschoene, robm
---
 src/java.base/share/classes/java/io/ObjectStreamClass.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/java.base/share/classes/java/io/ObjectStreamClass.java b/src/java.base/share/classes/java/io/ObjectStreamClass.java
index 1a1fd7e397a..dfcb558e497 100644
--- a/src/java.base/share/classes/java/io/ObjectStreamClass.java
+++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java
@@ -1161,6 +1161,10 @@ public class ObjectStreamClass implements Serializable {
             } catch (IllegalAccessException ex) {
                 // should not occur, as access checks have been suppressed
                 throw new InternalError(ex);
+            } catch (InstantiationError err) {
+                var ex = new InstantiationException();
+                ex.initCause(err);
+                throw ex;
             }
         } else {
             throw new UnsupportedOperationException();