From ff6eeb343ee9b840abf953f06fa3687c052ffdd5 Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Tue, 29 Nov 2016 16:29:45 -0600 Subject: [PATCH] feat: Closes all socket containers when the the merging socket closes. --- .../ice4j/socket/MergingDatagramSocket.java | 51 ++++++++++++++++--- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/ice4j/socket/MergingDatagramSocket.java b/src/main/java/org/ice4j/socket/MergingDatagramSocket.java index 7b1d179..e994feb 100644 --- a/src/main/java/org/ice4j/socket/MergingDatagramSocket.java +++ b/src/main/java/org/ice4j/socket/MergingDatagramSocket.java @@ -112,16 +112,22 @@ public class MergingDatagramSocket { return; } - - // TODO: close all containers - closed = true; + // XXX do we want to risk obtaining the lock here, or should we just // let any thread in find out about the close after it's next timeout? synchronized (receiveLock) { receiveLock.notifyAll(); } + + synchronized (socketContainersSyncRoot) + { + for (SocketContainer container : socketContainers) + { + doRemove(container.getSocket()); + } + } } /** @@ -334,10 +340,8 @@ public class MergingDatagramSocket } if (socketContainer != null) { - // Stop the reading thread. - // TODO: do we want to interrupt the thread here? This will not - // help unless we set a soTimeout > 0 - socketContainer.closed = true; + // We just removed it from the merging socket, so use remove=false + socketContainer.close(false); } } @@ -665,6 +669,10 @@ public class MergingDatagramSocket } } + // The receive thread is terminating, no reason to keep this + // container anymore. + close(true); + if (logger.isLoggable(Level.FINE)) { logger.fine("Finished: " + toString()); @@ -860,6 +868,35 @@ public class MergingDatagramSocket } } + /** + * @return the underlying socket of this {@link SocketContainer}. + */ + private Object getSocket() + { + return datagramSocket != null ? datagramSocket : delegatingSocket; + } + + /** + * Closes this {@link SocketContainer}, stopping it's reading thread, + * and, if necessary removing it from the merging socket. + * @param remove whether to remove this container from the merging + * socket. + */ + private void close(boolean remove) + { + if (closed && !remove) + { + return; + } + closed = true; + + thread.interrupt(); + if (remove) + { + MergingDatagramSocket.this.doRemove(getSocket()); + } + } + /** * Represents a {@link DatagramPacket} for the purposes of {@link * SocketContainer}.