From d1c7f5a4951de2c7b3874a789851f2e89343e68f Mon Sep 17 00:00:00 2001 From: Jacek Centkowski Date: Mon, 7 Nov 2016 14:26:43 +0100 Subject: [PATCH] Fix data race in MultiProgressMonitor This is work related to [1] but AFAICT real race condition happens only for count member. Therefore proposed protecting it in this change. [1] https://gerrit-review.googlesource.com/#/c/87442/ Change-Id: I8eca2e17be83af25cffd30b4de40cf7f46eb6f48 Signed-off-by: Jacek Centkowski --- .../java/com/google/gerrit/server/git/MultiProgressMonitor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java index d081fe6bd7..a87e6939a3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java @@ -319,7 +319,7 @@ public class MultiProgressMonitor { if (!tasks.isEmpty()) { boolean first = true; for (Task t : tasks) { - int count = t.count; + int count = t.getCount(); if (count == 0) { continue; }