From 471e29f6d9ebacb71d928e210c417efd99cc793b Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Tue, 13 Mar 2012 16:32:33 -0700 Subject: [PATCH] Always call getMessageSender() from MessageSenderOutputStream The MessageSenderOutputStream is created at AsyncReceiveCommits construction time, but the underlying ReceiveCommits' MessageSender can change over that object's lifetime. Change-Id: I1df74ff69d8f9178eaf44a959f3d444c0295b26c --- .../google/gerrit/server/git/AsyncReceiveCommits.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java index ec39ac6a41..660b818492 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.git; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.gerrit.server.git.ReceiveCommits.MessageSender; import com.google.gerrit.server.git.WorkQueue.Executor; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.util.RequestScopePropagator; @@ -113,26 +112,24 @@ public class AsyncReceiveCommits implements PreReceiveHook { } private class MessageSenderOutputStream extends OutputStream { - private final MessageSender messageSender = rc.getMessageSender(); - @Override public void write(int b) { - messageSender.sendBytes(new byte[]{(byte)b}); + rc.getMessageSender().sendBytes(new byte[]{(byte)b}); } @Override public void write(byte[] what, int off, int len) { - messageSender.sendBytes(what, off, len); + rc.getMessageSender().sendBytes(what, off, len); } @Override public void write(byte[] what) { - messageSender.sendBytes(what); + rc.getMessageSender().sendBytes(what); } @Override public void flush() { - messageSender.flush(); + rc.getMessageSender().flush(); } }