summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2018-08-31 10:17:41 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2018-08-31 10:28:57 +0900
commite898aeded6242deabe32e054a9698b7c37c203e2 (patch)
tree84f2628f30fa921d819dcd8cc63ba6592607664c
parentce98c50f38906c8516fdc66fe36593e339426dab (diff)
SshSession: Specify charset in constructor of Scanner
ErrorProne reports a warning [1] about implicit use of the platform default charset. [1] http://errorprone.info/bugpattern/DefaultCharset Change-Id: I8ed3f12ead13087c143a1235bef66de620b36ae6
-rw-r--r--gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/SshSession.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/SshSession.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/SshSession.java
index 227951f9cf..c433cadaa4 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/SshSession.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/SshSession.java
@@ -17,6 +17,7 @@ package com.google.gerrit.acceptance;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assert_;
+import static java.nio.charset.StandardCharsets.UTF_8;
import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.JSch;
@@ -52,10 +53,10 @@ public class SshSession {
InputStream err = channel.getErrStream();
channel.connect();
- Scanner s = new Scanner(err).useDelimiter("\\A");
+ Scanner s = new Scanner(err, UTF_8.name()).useDelimiter("\\A");
error = s.hasNext() ? s.next() : null;
- s = new Scanner(in).useDelimiter("\\A");
+ s = new Scanner(in, UTF_8.name()).useDelimiter("\\A");
return s.hasNext() ? s.next() : "";
} finally {
channel.disconnect();