From b6e5d035e577d7082b66a492a94fd761e8d7eae9 Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Wed, 10 May 2017 16:14:29 -0500 Subject: [PATCH] fix: Fixes a bug which prevents the socket to close. After the delegate is closed, isClosed() would return true, which would prevent the DatagramSocket instance (super) from actually closing and releasing its resources. --- .../org/ice4j/socket/DelegatingDatagramSocket.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java b/src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java index 7449864..db1984b 100644 --- a/src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java +++ b/src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java @@ -115,6 +115,11 @@ public class DelegatingDatagramSocket */ private long nbSentPackets = 0; + /** + * Whether this socket has been closed. + */ + private boolean closed = false; + /** * Initializes a new DelegatingDatagramSocket instance and binds it * to any available port on the local host machine. The socket will be @@ -282,10 +287,14 @@ public class DelegatingDatagramSocket @Override public void close() { + // We want both #delegate and super to actually get closed (and release + // the FDs which they hold). But super will not close unless isClosed() + // returns false. So we update the #closed flag last. if (delegate != null) delegate.close(); super.close(); + closed = true; } /** @@ -610,7 +619,7 @@ public class DelegatingDatagramSocket @Override public boolean isClosed() { - return (delegate == null) ? super.isClosed() : delegate.isClosed(); + return closed; } /**