From dfb8975e889ba6913d21dab1fcd6f7aabf085834 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Wed, 12 Sep 2018 14:42:53 +0900
Subject: [PATCH] MigrateToNoteDb: Specify charset when constructing
 PrintWriter

Change-Id: I916eeed389f9849724c239d372edd0bab93598e9
---
 .../src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java
index 0b44ccfd73..ff23747493 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java
@@ -16,6 +16,7 @@ package com.google.gerrit.pgm;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.gerrit.server.schema.DataSourceProvider.Context.MULTI_USER;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 
@@ -38,6 +39,7 @@ import com.google.gerrit.server.schema.DataSourceType;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Provider;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
@@ -137,7 +139,7 @@ public class MigrateToNoteDb extends SiteProgram {
           migrator.migrate();
         }
       }
-      try (PrintWriter w = new PrintWriter(System.out, true)) {
+      try (PrintWriter w = new PrintWriter(new OutputStreamWriter(System.out, UTF_8), true)) {
         gcAllUsers.run(w);
       }
     } finally {