Merge branch 'stable-2.14'
* stable-2.14:
Fix hook configuration names to match documentation
Change-Id: I66c9fadef5c2615a39af06f9560bbb9d4d477c17
diff --git a/src/main/java/com/googlesource/gerrit/plugins/hooks/HookQueue.java b/src/main/java/com/googlesource/gerrit/plugins/hooks/HookQueue.java
index 6a5e33e..bc7e5eb 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/hooks/HookQueue.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/hooks/HookQueue.java
@@ -19,11 +19,12 @@
import com.google.inject.Inject;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.concurrent.ScheduledExecutorService;
class HookQueue implements LifecycleListener {
private final WorkQueue workQueue;
- private WorkQueue.Executor queue;
+ private ScheduledExecutorService queue;
@Inject
HookQueue(WorkQueue queue) {
@@ -48,7 +49,6 @@
@Override
public void stop() {
if (queue != null) {
- queue.unregisterWorkQueue();
queue.shutdownNow();
queue = null;
}