Merge "ReceiveCommits: Don't synchronize on non-final fields"

gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java

@@ -1755,9 +1755,7 @@ public class ReceiveCommits {
               insertChange(threadLocalDb);
             }
           }
-          synchronized (newProgress) {
+          synchronizedIncrement(newProgress);
-            newProgress.update(1);
-          }
           return null;
         }
       }));
@@ -2174,9 +2172,7 @@ public class ReceiveCommits {
               }
             }
           } finally {
-            synchronized (replaceProgress) {
+            synchronizedIncrement(replaceProgress);
-              replaceProgress.update(1);
-            }
           }
         }
       }));
@@ -2846,4 +2842,10 @@ public class ReceiveCommits {
   private static boolean isConfig(final ReceiveCommand cmd) {
     return cmd.getRefName().equals(RefNames.REFS_CONFIG);
   }
+
+  private static void synchronizedIncrement(Task p) {
+    synchronized (p) {
+      p.update(1);
+    }
+  }
 }