From f95e9450f3922e2a18c1cd0775f1030d903cd490 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Fri, 8 Nov 2019 07:47:11 +0000 Subject: [PATCH] OutputStream.write --- .../muwire/core/connection/ConnectionAcceptor.groovy | 10 +++++----- .../com/muwire/core/trust/TrustSubscriber.groovy | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy b/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy index 628d0830..2308dd70 100644 --- a/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy +++ b/core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy @@ -399,7 +399,7 @@ class ConnectionAcceptor { DataOutputStream dos = new DataOutputStream(os) if (!json) { - os.write("\r\n") + os.write("\r\n".getBytes(StandardCharsets.US_ASCII)) int size = Math.min(Short.MAX_VALUE * 2, good.size()) good = good.subList(0, size) dos.writeShort(size) @@ -414,10 +414,10 @@ class ConnectionAcceptor { it.persona.write(dos) } } else { - dos.write("Json: true\r\n") - dos.write("Good:${good.size()}\r\n") - dos.write("Bad:${bad.size()}\r\n") - dos.write("\r\n") + dos.write("Json: true\r\n".getBytes(StandardCharsets.US_ASCII)) + dos.write("Good:${good.size()}\r\n".getBytes(StandardCharsets.US_ASCII)) + dos.write("Bad:${bad.size()}\r\n".getBytes(StandardCharsets.US_ASCII)) + dos.write("\r\n".getBytes(StandardCharsets.US_ASCII)) good.each { def obj = [:] diff --git a/core/src/main/groovy/com/muwire/core/trust/TrustSubscriber.groovy b/core/src/main/groovy/com/muwire/core/trust/TrustSubscriber.groovy index c9e8f864..ea169cb6 100644 --- a/core/src/main/groovy/com/muwire/core/trust/TrustSubscriber.groovy +++ b/core/src/main/groovy/com/muwire/core/trust/TrustSubscriber.groovy @@ -113,8 +113,8 @@ class TrustSubscriber { OutputStream os = endpoint.getOutputStream() InputStream is = endpoint.getInputStream() os.write("TRUST\r\n".getBytes(StandardCharsets.US_ASCII)) - os.write("Json:true\r\n") - os.write("\r\n") + os.write("Json:true\r\n".getBytes(StandardCharsets.US_ASCII)) + os.write("\r\n".getBytes(StandardCharsets.US_ASCII)) os.flush() String codeString = DataUtil.readTillRN(is)