X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectAction.java;h=c02d734f8a95ee34fc9b3e116c5f8357dbd02940;hb=bd86c2218b4a8befeb9b2789b62e1697993f0b5b;hp=901632627b218d35469fcc7cb6b71f2af2b8144d;hpb=08f80ac5fa60738d3ad74c4b5390a0b79ae313d4;p=nikiroo-utils.git diff --git a/src/be/nikiroo/utils/serial/server/ConnectAction.java b/src/be/nikiroo/utils/serial/server/ConnectAction.java index 9016326..c02d734 100644 --- a/src/be/nikiroo/utils/serial/server/ConnectAction.java +++ b/src/be/nikiroo/utils/serial/server/ConnectAction.java @@ -9,6 +9,7 @@ import javax.net.ssl.SSLException; import be.nikiroo.utils.CryptUtils; import be.nikiroo.utils.IOUtils; +import be.nikiroo.utils.StringUtils; import be.nikiroo.utils.serial.Exporter; import be.nikiroo.utils.serial.Importer; import be.nikiroo.utils.streams.BufferedOutputStream; @@ -288,7 +289,7 @@ abstract class ConnectAction { synchronized (lock) { OutputStream sub; if (crypt != null) { - sub = crypt.encrypt64(out.open(), false); + sub = crypt.encrypt64(out.open()); } else { sub = out.open(); } @@ -301,7 +302,7 @@ abstract class ConnectAction { try { if (asString) { - sub.write(data.toString().getBytes("UTF-8")); + sub.write(StringUtils.getBytes(data.toString())); } else { new Exporter(sub).append(data); } @@ -363,6 +364,7 @@ abstract class ConnectAction { * @throws java.lang.NullPointerException * for Objects only: if the counter part has no data to send */ + @SuppressWarnings("resource") private Object rec(boolean asString) throws IOException, NoSuchFieldException, NoSuchMethodException, ClassNotFoundException, java.lang.NullPointerException { @@ -383,7 +385,7 @@ abstract class ConnectAction { try { if (crypt != null) { - read = crypt.decrypt64(read, false); + read = crypt.decrypt64(read); } if (asString) {