--- /dev/null	2020-01-02 04:43:18.583999853 +0000
+++ new/test/jdk/jfr/api/consumer/TestRecordingFileReadEventEof.java	2020-01-30 06:28:34.264470221 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2018, 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package jdk.jfr.api.consumer;
+
+import java.io.EOFException;
+
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordingFile;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.jfr.Events;
+import jdk.test.lib.jfr.SimpleEvent;
+
+/**
+ * @test
+ * @summary Verifies that RecordingFile.readEvent() throws EOF when past the last record
+ * @key jfr
+ *
+ * @library /lib /
+ * @run main/othervm jdk.jfr.api.consumer.TestRecordingFileReadEventEof
+ */
+public class TestRecordingFileReadEventEof {
+
+    public static void main(String[] args) throws Throwable {
+        Recording r = new Recording();
+        r.start();
+        SimpleEvent t = new SimpleEvent();
+        t.commit();
+        r.stop();
+        RecordingFile file = Events.copyTo(r);
+        r.close();
+        file.readEvent();
+        try {
+            file.readEvent();
+            Asserts.fail("Expected EOFException not thrown");
+        } catch (EOFException x) {
+            // OK, as expected
+        }
+    }
+}