build fixes

Author: subes

src/matlabcontrol/MatlabProxyFactoryOptions.java

@@ -100,12 +100,12 @@ boolean getUseSingleComputationalThread() {
 	int getPort() {
 		return _port;
 	}
-	
-	public Writer getInputWriter() {
+
+	Writer getInputWriter() {
 		return _inputWriter;
 	}
 
-	public Writer getErrorWriter() {
+	Writer getErrorWriter() {
 		return _errorWriter;
 	}
 
@@ -401,28 +401,28 @@ public final Builder setPort(int port) {
 
 			return this;
 		}
-		
+
 		/**
 		 * Sets the input writer where the standard output of the created matlab process is written to.
 		 * This is only used when an actual process is spawned for the matlab proxy instance.
 		 * 
 		 * @param inputWriter
 		 */
-		public final Builder setInputWriter(Writer inputWriter){
+		public final Builder setInputWriter(Writer inputWriter) {
 			_inputWriter = inputWriter;
-			
+
 			return this;
 		}
-		
+
 		/**
 		 * Sets the error writer where the error output of the created matlab process is written to. 
 		 * This is only used when an actual process is spawned for the matlab proxy instance.
 		 * 
 		 * @param inputWriter
 		 */
-		public final Builder setErrorWriter(Writer errorWriter){
+		public final Builder setErrorWriter(Writer errorWriter) {
 			_errorWriter = errorWriter;
-			
+
 			return this;
 		}
 

src/matlabcontrol/RemoteMatlabProxyFactory.java

@@ -10,6 +10,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.charset.Charset;
 import java.rmi.AlreadyBoundException;
 import java.rmi.NoSuchObjectException;
 import java.rmi.NotBoundException;
@@ -316,7 +317,7 @@ private static class ProcessStreamDrainer extends Thread {
 		private final Writer _writer;
 
 		private ProcessStreamDrainer(InputStream stream, String type, Writer writer) {
-			_reader = new InputStreamReader(stream);
+			_reader = new InputStreamReader(stream, Charset.defaultCharset());
 			_writer = writer;
 
 			this.setDaemon(true);
@@ -327,11 +328,11 @@ private ProcessStreamDrainer(InputStream stream, String type, Writer writer) {
 		public void run() {
 			try {
 				char[] buffer = new char[1024];
-				if(_writer != null){
-					while (_reader.read(buffer) != -1){
+				if (_writer != null) {
+					while (_reader.read(buffer) != -1) {
 						_writer.write(buffer);
 					}
-				}else{
+				} else {
 					while (_reader.read(buffer) != -1)
 						;
 				}
@@ -340,7 +341,7 @@ public void run() {
 				throw new RuntimeException(e);
 			}
 		}
-		
+
 	}
 
 	/**