root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Handshaking should fix on the encoding. 

See f8916a839c5a7bfe6d0de100a33cf23de33de6e4 for the corresponding change in the remoting.

Since the error messages only use ASCII
This commit is contained in:
Kohsuke Kawaguchi 2013-06-12 17:18:59 +03:00
parent 25eff9006f
commit a452e5ff26
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/hudson/TcpSlaveAgentListener.java
View File

@ -26,8 +26,10 @@ package hudson;
import hudson.slaves.OfflineCause; import hudson.slaves.OfflineCause;
import jenkins.AgentProtocol; import jenkins.AgentProtocol;
import java.io.BufferedWriter;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.BindException; import java.net.BindException;
import java.net.ServerSocket; import java.net.ServerSocket;
@ -139,7 +141,9 @@ public final class TcpSlaveAgentListener extends Thread {
LOGGER.info("Accepted connection #"+id+" from "+s.getRemoteSocketAddress()); LOGGER.info("Accepted connection #"+id+" from "+s.getRemoteSocketAddress());
DataInputStream in = new DataInputStream(s.getInputStream()); DataInputStream in = new DataInputStream(s.getInputStream());
PrintWriter out = new PrintWriter(s.getOutputStream(),true); // DEPRECATED: newer protocol shouldn't use PrintWriter but should use DataOutputStream PrintWriter out = new PrintWriter(
new BufferedWriter(new OutputStreamWriter(s.getOutputStream(),"UTF-8")),
true); // DEPRECATED: newer protocol shouldn't use PrintWriter but should use DataOutputStream
String s = in.readUTF(); String s = in.readUTF();

4
core/src/main/java/hudson/cli/CliProtocol.java
View File

@ -9,7 +9,9 @@ import jenkins.model.Jenkins;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.Socket; import java.net.Socket;
@ -39,7 +41,7 @@ public class CliProtocol extends AgentProtocol {
} }
public void run() throws IOException, InterruptedException { public void run() throws IOException, InterruptedException {
PrintWriter out = new PrintWriter(socket.getOutputStream(),true); PrintWriter out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(),"UTF-8")),true);
out.println("Welcome"); out.println("Welcome");
runCli(new Connection(socket)); runCli(new Connection(socket));
} }

4
core/src/main/java/jenkins/slaves/JnlpSlaveAgentProtocol.java
View File

@ -12,10 +12,12 @@ import jenkins.security.HMACConfidentialKey;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.Socket; import java.net.Socket;
import java.util.logging.Level; import java.util.logging.Level;
@ -81,7 +83,7 @@ public class JnlpSlaveAgentProtocol extends AgentProtocol {
public Handler(Socket socket) throws IOException { public Handler(Socket socket) throws IOException {
this.socket = socket; this.socket = socket;
in = new DataInputStream(socket.getInputStream()); in = new DataInputStream(socket.getInputStream());
out = new PrintWriter(socket.getOutputStream(),true); out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(),"UTF-8")),true);
} }
protected void run() throws IOException, InterruptedException { protected void run() throws IOException, InterruptedException {