diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/project/Index.java')
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/project/Index.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/Index.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/Index.java index ceace1f870..8c8314b23f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/Index.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/Index.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.project; import static com.google.gerrit.server.git.QueueProvider.QueueType.BATCH; import com.google.common.io.ByteStreams; -import com.google.common.io.CharStreams; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.extensions.annotations.RequiresCapability; @@ -31,24 +30,25 @@ import com.google.gerrit.server.index.IndexExecutor; import com.google.gerrit.server.index.change.AllChangesIndexer; import com.google.gerrit.server.index.change.ChangeIndexer; import com.google.inject.Inject; +import com.google.inject.Provider; import com.google.inject.Singleton; -import java.io.PrintWriter; import java.util.concurrent.Future; +import org.eclipse.jgit.util.io.NullOutputStream; @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @Singleton public class Index implements RestModifyView<ProjectResource, ProjectInput> { - private final AllChangesIndexer allChangesIndexer; + private final Provider<AllChangesIndexer> allChangesIndexerProvider; private final ChangeIndexer indexer; private final ListeningExecutorService executor; @Inject Index( - AllChangesIndexer allChangesIndexer, + Provider<AllChangesIndexer> allChangesIndexerProvider, ChangeIndexer indexer, @IndexExecutor(BATCH) ListeningExecutorService executor) { - this.allChangesIndexer = allChangesIndexer; + this.allChangesIndexerProvider = allChangesIndexerProvider; this.indexer = indexer; this.executor = executor; } @@ -59,12 +59,13 @@ public class Index implements RestModifyView<ProjectResource, ProjectInput> { Task mpt = new MultiProgressMonitor(ByteStreams.nullOutputStream(), "Reindexing project") .beginSubTask("", MultiProgressMonitor.UNKNOWN); - PrintWriter pw = new PrintWriter(CharStreams.nullWriter()); + AllChangesIndexer allChangesIndexer = allChangesIndexerProvider.get(); + allChangesIndexer.setVerboseOut(NullOutputStream.INSTANCE); // The REST call is just a trigger for async reindexing, so it is safe to ignore the future's // return value. @SuppressWarnings("unused") Future<Void> ignored = - executor.submit(allChangesIndexer.reindexProject(indexer, project, mpt, mpt, pw)); + executor.submit(allChangesIndexer.reindexProject(indexer, project, mpt, mpt)); return Response.accepted("Project " + project + " submitted for reindexing"); } } |