diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2016-05-20 03:59:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-20 03:59:58 +0000 |
| commit | cbec061b802fc892c723cf609b0a416210ff1fbd (patch) | |
| tree | 5af849479d68ef012d5fef3db8b63c8dd5489a06 | |
| parent | e607fa5fbc9dafab99a290794fb9b962056bcbbb (diff) | |
| parent | e31f463d21e858ea1927ab1a5116dcd8b2090357 (diff) | |
Merge "Merge branch 'stable-2.11' into stable-2.12" into stable-2.12
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java index e7d86ab722..c10241b718 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java @@ -97,7 +97,6 @@ public class PatchListLoader implements Callable<PatchList> { private final PatchListKey key; private final Project.NameKey project; private final long timeoutMillis; - private final Object lock; @AssistedInject PatchListLoader(GitRepositoryManager mgr, @@ -112,7 +111,6 @@ public class PatchListLoader implements Callable<PatchList> { diffExecutor = de; key = k; project = p; - lock = new Object(); timeoutMillis = ConfigUtil.getTimeUnit(cfg, "cache", PatchListCacheImpl.FILE_NAME, "timeout", TimeUnit.MILLISECONDS.convert(5, TimeUnit.SECONDS), @@ -238,7 +236,7 @@ public class PatchListLoader implements Callable<PatchList> { Future<FileHeader> result = diffExecutor.submit(new Callable<FileHeader>() { @Override public FileHeader call() throws IOException { - synchronized (lock) { + synchronized (diffEntry) { return diffFormatter.toFileHeader(diffEntry); } } @@ -254,7 +252,7 @@ public class PatchListLoader implements Callable<PatchList> { + " comparing " + diffEntry.getOldId().name() + ".." + diffEntry.getNewId().name()); result.cancel(true); - synchronized (lock) { + synchronized (diffEntry) { return toFileHeaderWithoutMyersDiff(diffFormatter, diffEntry); } } catch (ExecutionException e) { |