From 626c35e4602866a1dee389304e2f6d53fa3d9805 Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Tue, 9 Nov 2021 00:01:59 +0100 Subject: [PATCH] Return unwrapped SocketOutputStream from PseudoTcpSocket JDK17 introduced a wrapper around SocketOutputStream in Socket.getOutputStream that doesn't forward flush. Directly return our implementation in PseudoTcpSocket making sure that the original intent of closing the socket when the stream is closed is still followed. --- .../java/org/ice4j/pseudotcp/PseudoTcpSocket.java | 7 +++++++ .../org/ice4j/pseudotcp/PseudoTcpSocketImpl.java | 1 + .../org/ice4j/pseudotcp/PseudoTcpStreamTest.java | 12 ++++++++---- src/test/resources/logging.properties | 1 + 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/ice4j/pseudotcp/PseudoTcpSocket.java b/src/main/java/org/ice4j/pseudotcp/PseudoTcpSocket.java index 8758dc8..387909e 100644 --- a/src/main/java/org/ice4j/pseudotcp/PseudoTcpSocket.java +++ b/src/main/java/org/ice4j/pseudotcp/PseudoTcpSocket.java @@ -245,6 +245,7 @@ public class PseudoTcpSocket extends Socket /** * {@inheritDoc} */ + @Override public synchronized void close() throws IOException { @@ -256,6 +257,12 @@ public class PseudoTcpSocket extends Socket } } + @Override + public OutputStream getOutputStream() throws IOException + { + return socketImpl.getOutputStream(); + } + /** * Allows to set up the remote address directly. * Otherwise, when using the other accept methods, diff --git a/src/main/java/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java b/src/main/java/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java index fdc28f0..38c0656 100755 --- a/src/main/java/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java +++ b/src/main/java/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java @@ -1160,6 +1160,7 @@ class PseudoTcpSocketImpl @Override public void close() throws IOException { + PseudoTcpSocketImpl.this.close(); } } diff --git a/src/test/java/org/ice4j/pseudotcp/PseudoTcpStreamTest.java b/src/test/java/org/ice4j/pseudotcp/PseudoTcpStreamTest.java index aead277..4533852 100755 --- a/src/test/java/org/ice4j/pseudotcp/PseudoTcpStreamTest.java +++ b/src/test/java/org/ice4j/pseudotcp/PseudoTcpStreamTest.java @@ -91,11 +91,15 @@ public class PseudoTcpStreamTest { client.setDebugName("R"); client.connect(serverAddress, 5000); + OutputStream os = client.getOutputStream(); + // write single array for (int i = 0; i < singleStepCount; i++) - client.getOutputStream().write(bufferSingle[i]); + os.write(bufferSingle[i]); + // write whole array - client.getOutputStream().write(bufferA); + os.write(bufferA); + // write by parts int partCount = 7; boolean notExact = sizeB % partCount != 0; @@ -111,11 +115,11 @@ public class PseudoTcpStreamTest int written = 0; for (int j : partsSize) { - client.getOutputStream().write(bufferB, written, j); + os.write(bufferB, written, j); written += j; } assertEquals(sizeB, written); - client.getOutputStream().flush(); + os.flush(); client.close(); } catch (IOException ex) diff --git a/src/test/resources/logging.properties b/src/test/resources/logging.properties index 9b26aba..88c84e2 100644 --- a/src/test/resources/logging.properties +++ b/src/test/resources/logging.properties @@ -51,6 +51,7 @@ java.util.logging.ConsoleHandler.formatter = org.ice4j.util.Ice4jLogFormatter # Things coming from ice4j org.ice4j.level = INFO +org.ice4j.pseudotcp.PseudoTCPBase.level = SEVERE test.level = INFO #org.ice4j.ice.checks.levell = FINEST #org.ice4j.ice.ConnectivityCheckClient.level = FINER