From 4450825ecc56b73ddd44eb992415a9bbbae238c7 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Thu, 8 Sep 2011 11:44:10 +0200 Subject: [PATCH] stream-events: fix change subject in patchset-created event If a new patch set is uploaded for an existing change that changes the subject of the change, then the patchset-created event that is sent for the stream-events command does not contain the new change subject, but the subject as it was before the upload of the new patch set. With this change the new change subject is now properly returned. Change-Id: I0835fd881d2f043f5609eadd52693cbb28dc5126 Signed-off-by: Edwin Kempin --- .../java/com/google/gerrit/server/git/ReceiveCommits.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 7e130a5acb..4f2a4abb2b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -1192,9 +1192,11 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook { final Ref mergedInto = findMergedInto(change.getDest().get(), c); result.mergedIntoRef = mergedInto != null ? mergedInto.getName() : null; } + final PatchSetInfo info = patchSetInfoFactory.get(c, ps.getId()); + change.setCurrentPatchSet(info); result.change = change; result.patchSet = ps; - result.info = patchSetInfoFactory.get(c, ps.getId()); + result.info = info; final Account.Id authorId = result.info.getAuthor() != null ? result.info.getAuthor().getAccount()