commit 512448049daee35967fc5ce288d1758ea16fee0f
author Yacob Yonas <yyonas@google.com> Tue Jul 15 13:54:05 2014 -0700
committer Yacob Yonas <yyonas@google.com> Fri Jul 18 14:26:54 2014 -0700
tree afd9a21594c2088cf9555c443cf465b4ea4ed0ef
parent f36b3e2c8d86bdef0e79455c881a98d2d3f5e43d

Correct ordering of PatchLineComments in ChangeNotes

The ordering of the comment comparator in ChangeNotes should match the
ordering defined in the PatchLineCommentAccess (compare filename, then
line number, then writtenOn).

Change-Id: Icc96f807f6e8a954f9e0a922e777278cb86a3bf1

gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
index a92e80a..b242d7c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
@@ -103,8 +103,8 @@
       String filename1 = c1.getKey().getParentKey().get();
       String filename2 = c2.getKey().getParentKey().get();
       return ComparisonChain.start()
-          .compare(c1.getLine(), c2.getLine())
           .compare(filename1, filename2)
+          .compare(c1.getLine(), c2.getLine())
           .compare(c1.getWrittenOn(), c2.getWrittenOn())
           .result();
     }