commit f4dcb9a0e3613a4aa11c1c99d81e16af84e4534b
author Youssef Elghareeb <ghareeb@google.com> Wed May 12 13:22:50 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 12 13:22:50 2021 +0000
tree 7cf56d1baf7334a3edb40d797aaeb7b3ebf1a590
parent d17eed73930711e8bade0c6531df9978506fdfbf
parent 5f36047c1e3b87486a3b2c83413dd65a28469c2e

Merge "CommentJson fix: URL decode comment id before requesting comment context"

java/com/google/gerrit/server/restapi/change/CommentJson.java

diff --git a/java/com/google/gerrit/server/restapi/change/CommentJson.java b/java/com/google/gerrit/server/restapi/change/CommentJson.java
index edc8fcf..81b6fb3 100644
--- a/java/com/google/gerrit/server/restapi/change/CommentJson.java
+++ b/java/com/google/gerrit/server/restapi/change/CommentJson.java
@@ -190,7 +190,7 @@
       return CommentContextKey.builder()
           .project(project)
           .changeId(changeId)
-          .id(r.id)
+          .id(Url.decode(r.id)) // We reverse the encoding done while filling comment info
           .path(r.path)
           .patchset(r.patchSet)
           .contextPadding(contextPadding)