From 88a274019f4d96b69c75bde283268ef45a6bc2ab Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Wed, 9 Oct 2013 12:16:44 -0700
Subject: [PATCH] Run indexing in sameThreadExecutor when index.threads <= 0

Change-Id: I3fb5a2ec039335cd8962b4a0973fbff7de55842f
---
 .../java/com/google/gerrit/server/index/IndexModule.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java
index 4bf7c356b1..2cfc93d1e8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java
@@ -19,7 +19,6 @@ import com.google.common.util.concurrent.MoreExecutors;
 import com.google.gerrit.lifecycle.LifecycleModule;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.git.WorkQueue;
-import com.google.gerrit.server.git.WorkQueue.Executor;
 import com.google.gerrit.server.query.change.ChangeQueryRewriter;
 import com.google.inject.AbstractModule;
 import com.google.inject.Injector;
@@ -108,13 +107,11 @@ public class IndexModule extends LifecycleModule {
       if (threads <= 0) {
         threads = config.getInt("index", null, "threads", 0);
       }
-      Executor executor;
       if (threads <= 0) {
-        executor = workQueue.getDefaultQueue();
-      } else {
-        executor = workQueue.createQueue(threads, "index");
+        return MoreExecutors.sameThreadExecutor();
       }
-      return MoreExecutors.listeningDecorator(executor);
+      return MoreExecutors.listeningDecorator(
+          workQueue.createQueue(threads, "index"));
     }
   }
 }