diff --git a/src/main/java/org/ice4j/ice/ComponentSocket.java b/src/main/java/org/ice4j/ice/ComponentSocket.java index f52b6ee..92eb949 100644 --- a/src/main/java/org/ice4j/ice/ComponentSocket.java +++ b/src/main/java/org/ice4j/ice/ComponentSocket.java @@ -203,8 +203,12 @@ public class ComponentSocket } finally { - component.getParentStream().removePairStateChangeListener(this); - component = null; + Component component = this.component; + if (component != null) + { + component.getParentStream().removePairStateChangeListener(this); + this.component = null; + } } } } diff --git a/src/main/java/org/ice4j/socket/MergingDatagramSocket.java b/src/main/java/org/ice4j/socket/MergingDatagramSocket.java index af7235f..789f09d 100644 --- a/src/main/java/org/ice4j/socket/MergingDatagramSocket.java +++ b/src/main/java/org/ice4j/socket/MergingDatagramSocket.java @@ -136,29 +136,37 @@ public class MergingDatagramSocket @Override public void close() { - if (isClosed()) + try { - return; + super.close(); } - closed = true; - logger.info("Closing."); - - // XXX do we want to risk obtaining the lock here, or should we just - // let any thread in receive() find out about the close after it's next - // timeout? - synchronized (receiveLock) + finally { - receiveLock.notifyAll(); - } - synchronized (socketContainersSyncRoot) - { - active = null; - for (SocketContainer container : socketContainers) + if (isClosed()) { - container.close(false); + return; + } + closed = true; + logger.info("Closing."); + + // XXX do we want to risk obtaining the lock here, or should we just + // let any thread in receive() find out about the close after it's + // next timeout? + synchronized (receiveLock) + { + receiveLock.notifyAll(); + } + + synchronized (socketContainersSyncRoot) + { + active = null; + for (SocketContainer container : socketContainers) + { + container.close(false); + } + socketContainers = new SocketContainer[0]; } - socketContainers = new SocketContainer[0]; } }