--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/EventDirectoryStream.java	Thu Aug 29 19:30:32 2019 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/EventDirectoryStream.java	Thu Aug 29 19:31:57 2019 +0200
@@ -63,7 +63,7 @@
             super(acc, active);
             this.fileAccess = fileAccess;
             this.active = active;
-            repositoryFiles = new RepositoryFiles(fileAccess, p     );
+            repositoryFiles = new RepositoryFiles(fileAccess, p);
         }
 
         @Override
@@ -104,7 +104,7 @@
                         } else {
                             awaitnewEvent = processUnordered(awaitnewEvent);
                         }
-                        if (segmentStart > end) {
+                        if (chunkParser.getStartNanos() + chunkParser.getChunkDuration() > end) {
                             close();
                             return;
                         }