From 15dbdddb18ec49dc8ff83cde9980c9dee1787ce1 Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Thu, 10 Mar 2016 15:50:23 -0500
Subject: [PATCH] ChangeNotesParser: Support out-of-order timestamps

Since Ic10584e PostReview may take an arbitrary timestamp, resulting
in possible timestamp skew, possibly even exceeding the slop window in
JGit. Take the maximum timestamp instead of just trusting the tip.

Change-Id: I37d62217f3f37edb469d9f7ab569d3957b70a663
---
 .../com/google/gerrit/server/notedb/ChangeNotesParser.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesParser.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesParser.java
index a57dff0643..075ca363af 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesParser.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesParser.java
@@ -276,8 +276,10 @@ class ChangeNotesParser implements AutoCloseable {
       // behavior.
     }
 
-    if (lastUpdatedOn == null && updateTs) {
-      lastUpdatedOn = ts;
+    if (updateTs) {
+      if (lastUpdatedOn == null || ts.after(lastUpdatedOn)) {
+        lastUpdatedOn = ts;
+      }
     }
   }