UTF-8 is always supported in Java

1 files changed, 9 insertions, 8 deletions

diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/StdOutVisitorHandler.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/StdOutVisitorHandler.java
index 6a31ca89162..33ff3dab9f5 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/StdOutVisitorHandler.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/StdOutVisitorHandler.java
@@ -18,6 +18,7 @@ import com.yahoo.messagebus.Message;
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,16 +53,16 @@ public class StdOutVisitorHandler extends VdsVisitHandler {
         this.indentXml = indentXml;
         this.processTimeMilliSecs = processtime;
         this.jsonOutput = jsonOutput;
-        String charset = "UTF-8";
+        this.out = createStdOutPrintStream();
+        dataHandler = new DataHandler(doStatistics);
+    }
+
+    private static PrintStream createStdOutPrintStream() {
         try {
-            out = new PrintStream(System.out, true, charset);
-        } catch (java.io.UnsupportedEncodingException e) {
-            System.out.println(charset + " is an unsupported encoding, " +
-                               "using default instead.");
-            out = System.out;
+            return new PrintStream(System.out, true, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e); // Will not happen - UTF-8 is always supported
         }
-
-        dataHandler = new DataHandler(doStatistics);
     }
 
     @Override