diff --git a/src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java b/src/main/java/org/ice4j/socket/DelegatingDatagramSocket.java index cffbd91..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() { - if (delegate == null) - super.close(); - else + // 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; } /** diff --git a/src/main/java/org/ice4j/socket/MultiplexedDatagramSocket.java b/src/main/java/org/ice4j/socket/MultiplexedDatagramSocket.java index 595830d..086281e 100644 --- a/src/main/java/org/ice4j/socket/MultiplexedDatagramSocket.java +++ b/src/main/java/org/ice4j/socket/MultiplexedDatagramSocket.java @@ -118,6 +118,8 @@ public class MultiplexedDatagramSocket public void close() { multiplexing.close(this); + + super.close(); } /** diff --git a/src/main/java/org/ice4j/socket/RelayedCandidateDatagramSocket.java b/src/main/java/org/ice4j/socket/RelayedCandidateDatagramSocket.java index 63b327b..a3cc2d8 100644 --- a/src/main/java/org/ice4j/socket/RelayedCandidateDatagramSocket.java +++ b/src/main/java/org/ice4j/socket/RelayedCandidateDatagramSocket.java @@ -350,6 +350,8 @@ public class RelayedCandidateDatagramSocket turnCandidateHarvest.hostCandidate.getTransportAddress(), this); turnCandidateHarvest.close(this); + + super.close(); } /**