diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2018-10-12 21:28:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-12 21:28:08 +0000 |
| commit | 5800a1002ca6c6b5a605a34027ede16eb475342d (patch) | |
| tree | 6bd8fea1b5e017ed52b2090e006f505d668176de | |
| parent | 93d2cfec929de1f9f2a0a63fb704b5e5343e9001 (diff) | |
| parent | b0ddb9c82bd3909740c271bfa4200c8c6d19d9cc (diff) | |
Merge changes I1975da67,I727bd814
* changes:
Add .apt_generated_tests to .gitignore
AllProjectsIndexer: Fix usage of platform default charset
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | java/com/google/gerrit/server/index/project/AllProjectsIndexer.java | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 5fdc85b159..e54435642a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ .DS_Store .gwt_work_dir /.apt_generated +/.apt_generated_tests /.bazel_path /.buckd /.classpath diff --git a/java/com/google/gerrit/server/index/project/AllProjectsIndexer.java b/java/com/google/gerrit/server/index/project/AllProjectsIndexer.java index 650df221ab..305cd25285 100644 --- a/java/com/google/gerrit/server/index/project/AllProjectsIndexer.java +++ b/java/com/google/gerrit/server/index/project/AllProjectsIndexer.java @@ -29,7 +29,6 @@ import com.google.gerrit.server.index.IndexExecutor; import com.google.gerrit.server.project.ProjectCache; import com.google.inject.Inject; import com.google.inject.Singleton; -import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; @@ -54,7 +53,7 @@ public class AllProjectsIndexer extends SiteIndexer<Project.NameKey, ProjectData @Override public SiteIndexer.Result indexAll(final ProjectIndex index) { - ProgressMonitor progress = new TextProgressMonitor(new PrintWriter(progressOut)); + ProgressMonitor progress = new TextProgressMonitor(newPrintWriter(progressOut)); progress.start(2); List<Project.NameKey> names = collectProjects(progress); return reindexProjects(index, names, progress); |