From 808fdc4af212825910a1468913278cc1228bf89d Mon Sep 17 00:00:00 2001 From: emcho Date: Wed, 3 Feb 2010 20:31:29 +0000 Subject: [PATCH] Tries to prevent a race condition while closing sockets. --- src/org/ice4j/stack/Connector.java | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/org/ice4j/stack/Connector.java b/src/org/ice4j/stack/Connector.java index 7f20ac0..aba0cc8 100644 --- a/src/org/ice4j/stack/Connector.java +++ b/src/org/ice4j/stack/Connector.java @@ -40,6 +40,12 @@ class Connector */ private DatagramSocket sock; + /** + * The object that we use to lock socket operations (since the socket itself + * is often null) + */ + private final Object sockLock = new Object(); + /** * A flag that is set to false to exit the message processor. */ @@ -112,7 +118,22 @@ class Connector byte message[] = new byte[bufsize]; DatagramPacket packet = new DatagramPacket(message, bufsize); - sock.receive(packet); + DatagramSocket localSock; + + synchronized (sockLock) + { + if (!isRunning) + return; + + localSock = this.sock; + } + + + localSock.receive(packet); + + //get lost if we are no longer running. + if(!isRunning) + return; //get lost if we are no longer running. if(!isRunning) @@ -176,8 +197,11 @@ class Connector */ protected void stop() { - this.sock = null; - this.isRunning = false; + synchronized(sockLock) + { + this.isRunning = false; + this.sock = null; + } } /**