diff -r 4ebc2e2fb97c -r 71c04702a3d5 test/jdk/java/io/Serializable/underlyingOutputStreamException/UnderlyingOutputStreamException.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/io/Serializable/underlyingOutputStreamException/UnderlyingOutputStreamException.java	Tue Sep 12 19:03:39 2017 +0200
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @summary Verify that if ObjectOutputStream's underlying OutputStream throws
+ *          an IOException, the original IOException (not a
+ *          StreamCorruptedException) will be thrown to the writing thread.
+ */
+
+import java.io.*;
+
+class OriginalIOException extends IOException {
+}
+
+class BrokenOutputStream extends OutputStream {
+    boolean broken = false;
+
+    public void write(int b) throws IOException {
+        if (broken) {
+            throw new OriginalIOException();
+        }
+    }
+}
+
+public class UnderlyingOutputStreamException {
+    public static void main(String[] args) throws Exception {
+        BrokenOutputStream bout = new BrokenOutputStream();
+        ObjectOutputStream oout = new ObjectOutputStream(bout);
+        bout.broken = true;
+        try {
+            oout.writeObject("foo");
+            throw new Error();
+        } catch (OriginalIOException ex) {
+        }
+    }
+}