yoavs 2004/12/15 07:39:11
Modified: docs HISTORY.txt
src/java/org/apache/log4j/net TelnetAppender.java
Log:
Bugzilla 26117.
Revision Changes Path
1.19 +2 -0 logging-log4j/docs/HISTORY.txt
Index: HISTORY.txt
===================================================================
RCS file: /home/cvs/logging-log4j/docs/HISTORY.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- HISTORY.txt 14 Dec 2004 21:11:04 -0000 1.18
+++ HISTORY.txt 15 Dec 2004 15:39:11 -0000 1.19
@@ -45,6 +45,8 @@
- Fixed Bugzilla 28464: White space significant at end of line for
PropertyConfigurator. [*]
+ - Fixed Bugzilla 26117: Output encoding for TelnetAppender. [*]
+
November 25, 2004
- Release of version 1.3alpha-3
1.8 +6 -1
logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java
Index: TelnetAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TelnetAppender.java 13 Dec 2004 15:18:26 -0000 1.7
+++ TelnetAppender.java 15 Dec 2004 15:39:11 -0000 1.8
@@ -128,6 +128,7 @@
private ServerSocket serverSocket;
private int MAX_CONNECTIONS = 20;
private Logger logger = Logger.getLogger(SocketHandler.class);
+ private String encoding = "UTF-8";
public SocketHandler(int port) throws IOException {
serverSocket = new ServerSocket(port);
@@ -175,7 +176,11 @@
while (!done) {
try {
Socket newClient = serverSocket.accept();
- PrintWriter pw = new PrintWriter(newClient.getOutputStream());
+
+ // Bugzilla 26117: use an encoding to support EBCDIC machines
+ // Could make encoding a JavaBean property or even make
TelnetAppender
+ // extend WriterAppender, which already has encoding support.
+ PrintWriter pw = new PrintWriter(new
OutputStreamWriter(newClient.getOutputStream(), encoding));
if (connections.size() < MAX_CONNECTIONS) {
connections.addElement(newClient);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
