commit 0223ebc8cfbd4dd40c4f012f56051c45c26c8e3e
author Yacob Yonas <yyonas@google.com> Tue Jul 29 19:38:27 2014 -0700
committer Yacob Yonas <yyonas@google.com> Thu Aug 07 13:30:04 2014 -0700
tree 564ba6f748bd997bbf4f6bd35239ef06b0d9eb55
parent 7ae1b578fa69dde6c99d1b27dd770a2ed565eff4

Fix bug for comments with no range

I forgot to advance the current pointer past the newline character
when parsing a comment that had just a line number and not a
CommentRange. I added a test for this corner case.

Change-Id: I803717e8ea391aa067f40c2d7403f54ee9795733

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

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java
index 99f9542..c2e5dfc 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java
@@ -239,6 +239,7 @@
 
     if (note[ptr.value] == '\n') {
       range.setEndLine(startLine);
+      ptr.value += 1;
       return range;
     } else if (note[ptr.value] == ':') {
       range.setStartLine(startLine);

gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java

diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java
index 6db2557..81d2503 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java
@@ -1370,6 +1370,34 @@
     assertTrue(notes.getDraftPsComments(otherUserId).values().isEmpty());
   }
 
+  @Test
+  public void patchLineCommentNoRange() throws Exception {
+    Change c = newChange();
+    ChangeUpdate update = newUpdate(c, otherUser);
+    String uuid = "uuid";
+    String messageForBase = "comment for base";
+    Timestamp now = TimeUtil.nowTs();
+    PatchSet.Id psId = c.currentPatchSetId();
+
+    PatchLineComment commentForBase =
+        newPublishedPatchLineComment(psId, "filename", uuid,
+        null, 1, otherUser, null, now, messageForBase,
+        (short) 0, "abcd1234abcd1234abcd1234abcd1234abcd1234");
+    update.setPatchSetId(psId);
+    update.upsertComment(commentForBase);
+    update.commit();
+
+    ChangeNotes notes = newNotes(c);
+    Multimap<PatchSet.Id, PatchLineComment> commentsForBase =
+        notes.getBaseComments();
+    Multimap<PatchSet.Id, PatchLineComment> commentsForPs =
+        notes.getPatchSetComments();
+
+    assertTrue(commentsForPs.isEmpty());
+    assertEquals(commentForBase,
+        Iterables.getOnlyElement(commentsForBase.get(psId)));
+  }
+
   private Change newChange() {
     return TestChanges.newChange(project, changeOwner);
   }