| commit | bb798b00bb8300c6fe5d64a6833963bc28190b3b | [log] [tgz] |
|---|---|---|
| author | Han-Wen Nienhuys <hanwen@google.com> | Mon Jun 12 14:54:59 2017 +0200 |
| committer | Han-Wen Nienhuys <hanwen@google.com> | Mon Jun 12 15:51:04 2017 +0200 |
| tree | 0851d513d48203bdac528f4c4f1c623b61b603d2 | |
| parent | f05ee3fc7372e7192554159747ad74fe0f0df720 [diff] |
Remove Executor#unregisterWorkQueue We use ScheduledThreadPoolExecutor#terminated to manage cleanup of WorkQueue. Callers of unregisterWorkQueue should just delete the call. Change-Id: I0208c8643bd71eb287ff553f80e7ffe547f3ffbe
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java index 99af21d..9c08f4e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
@@ -204,7 +204,9 @@ queueName = prefix; } - public void unregisterWorkQueue() { + @Override + protected void terminated() { + super.terminated(); queues.remove(this); }
diff --git a/plugins/hooks b/plugins/hooks index 60adf57..0e25154 160000 --- a/plugins/hooks +++ b/plugins/hooks
@@ -1 +1 @@ -Subproject commit 60adf5742f44badc5193b42ffc841bb2d0f6e442 +Subproject commit 0e25154b61b0b52b922121f565f4227fe6000441
diff --git a/plugins/replication b/plugins/replication index db4aecb..98b7156 160000 --- a/plugins/replication +++ b/plugins/replication
@@ -1 +1 @@ -Subproject commit db4aecb2b813e19007b8896a35ac68e794f758a3 +Subproject commit 98b7156cee8269e794932d89e3eca667bb918cb3