--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/EventParser.java	Thu Jul 11 02:21:18 2019 +0200
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/EventParser.java	Fri Jul 12 15:04:28 2019 +0200
@@ -101,7 +101,7 @@
     }
 
     public boolean isEnabled() {
-        return this.enabled;
+        return enabled;
     }
 
     public RecordedEvent parse(RecordingInput input) throws IOException {
@@ -110,16 +110,16 @@
         }
 
         long startTicks = input.readLong();
-        long durationTicks = 0;
+        long endTicks = startTicks;
         if (hasDuration) {
-            durationTicks = input.readLong();
+            long durationTicks = input.readLong();
             if (thresholdNanos > 0L) {
                 if (timeConverter.convertTimespan(durationTicks) < thresholdNanos) {
                     return null;
                 }
             }
+            endTicks += durationTicks;
         }
-        long endTicks = startTicks + durationTicks;
         if (firstNanos > 0L) {
             if (timeConverter.convertTimestamp(endTicks) < firstNanos) {
                 return null;