azkaban-aplcache

diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/AzkabanExecutorServer.java b/azkaban-exec-server/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
index 191b810..b65a69f 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/AzkabanExecutorServer.java
@@ -57,6 +57,9 @@ import java.io.InputStreamReader;
 import java.lang.management.ManagementFactory;
 import java.lang.reflect.Constructor;
 import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TimeZone;
@@ -208,7 +211,7 @@ public class AzkabanExecutorServer {
 
           final InputStream is = p.getInputStream();
           final java.io.BufferedReader reader =
-              new java.io.BufferedReader(new InputStreamReader(is));
+              new java.io.BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
           String line = null;
           while ((line = reader.readLine()) != null) {
             logger.info(line);
@@ -294,8 +297,8 @@ public class AzkabanExecutorServer {
 
   private void dumpPortToFile() {
     // By default this should write to the working directory
-    try (BufferedWriter writer = new BufferedWriter(
-        new FileWriter(AZKABAN_EXECUTOR_PORT_FILENAME))) {
+    try (BufferedWriter writer = Files
+        .newBufferedWriter(Paths.get(AZKABAN_EXECUTOR_PORT_FILENAME), StandardCharsets.UTF_8)) {
       writer.write(String.valueOf(getPort()));
       writer.write("\n");
     } catch (final IOException e) {

diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/event/JobCallbackRequestMaker.java b/azkaban-exec-server/src/main/java/azkaban/execapp/event/JobCallbackRequestMaker.java
index 070856b..aa9e0b9 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/event/JobCallbackRequestMaker.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/event/JobCallbackRequestMaker.java
@@ -11,6 +11,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.SocketTimeoutException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -203,7 +204,7 @@ public class JobCallbackRequestMaker {
         if (responseEntity != null) {
           bufferedReader =
               new BufferedReader(new InputStreamReader(
-                  responseEntity.getContent()));
+                  responseEntity.getContent(), StandardCharsets.UTF_8));
 
           String line = "";
           int lineCount = 0;

diff --git a/azkaban-exec-server/src/main/java/azkaban/execapp/ServerStatisticsServlet.java b/azkaban-exec-server/src/main/java/azkaban/execapp/ServerStatisticsServlet.java
index 2833f23..11ab6e3 100644
--- a/azkaban-exec-server/src/main/java/azkaban/execapp/ServerStatisticsServlet.java
+++ b/azkaban-exec-server/src/main/java/azkaban/execapp/ServerStatisticsServlet.java
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -85,7 +86,7 @@ public class ServerStatisticsServlet extends HttpServlet {
         final InputStream inputStream = process.getInputStream();
         try {
           final java.io.BufferedReader reader = new java.io.BufferedReader(
-              new InputStreamReader(inputStream));
+              new InputStreamReader(inputStream, StandardCharsets.UTF_8));
           String line = null;
           while ((line = reader.readLine()) != null) {
             output.add(line);
@@ -242,7 +243,7 @@ public class ServerStatisticsServlet extends HttpServlet {
         final InputStream inputStream = process.getInputStream();
         try {
           final java.io.BufferedReader reader = new java.io.BufferedReader(
-              new InputStreamReader(inputStream));
+              new InputStreamReader(inputStream, StandardCharsets.UTF_8));
           String line = null;
           while ((line = reader.readLine()) != null) {
             output.add(line);

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
index 407f00f..fb25ffb 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
@@ -32,6 +32,7 @@ import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -580,7 +581,7 @@ public class AzkabanWebServer extends AzkabanServer {
 
           InputStream is = p.getInputStream();
           java.io.BufferedReader reader =
-              new java.io.BufferedReader(new InputStreamReader(is));
+              new java.io.BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
           String line = null;
           while ((line = reader.readLine()) != null) {
             logger.info(line);