From: Jan P. <jp...@us...> - 2006-10-21 17:02:31
|
Update of /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/util In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1711/src/org/epic/debug/util Modified Files: RemotePort.java Log Message: Merged from 'stable'. Index: RemotePort.java =================================================================== RCS file: /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/util/RemotePort.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- RemotePort.java 7 Mar 2006 19:43:39 -0000 1.8 +++ RemotePort.java 21 Oct 2006 17:02:27 -0000 1.9 @@ -1,11 +1,6 @@ package org.epic.debug.util; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.PrintWriter; +import java.io.*; import java.net.ServerSocket; import java.net.Socket; @@ -107,9 +102,7 @@ { assert isConnected(); - if (mReader == null) - mReader = new BufferedReader(new InputStreamReader(getInStream())); - + if (mReader == null) createReader(); return mReader; } @@ -186,9 +179,7 @@ } mWriter = new PrintWriter(mClient.getOutputStream(), true); - mReader = new BufferedReader( - new InputStreamReader(mClient.getInputStream())); - + mReader = createReader(); } catch (IOException e) { @@ -202,6 +193,20 @@ } return mWaitOK; } + + private BufferedReader createReader() + { + try + { + return new BufferedReader( + new InputStreamReader(getInStream(), "UTF8")); + } + catch (UnsupportedEncodingException e) + { + PerlDebugPlugin.log(e); // impossible + return new BufferedReader(new InputStreamReader(getInStream())); + } + } private void reset() { |