Revision: 6fe1ce544d60
Author:   mranga <mranga@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date:     Tue Jul 31 12:09:28 2012
Log:      JSIP-428: Fix thread auditor (apply patch supplied by ywang4074)


git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2135 8e71dc83-d81e-6649-80f2-80b843a9b2be

http://code.google.com/p/jain-sip/source/detail?r=6fe1ce544d60

Modified:
 /src/gov/nist/javax/sip/stack/UDPMessageChannel.java

=======================================
--- /src/gov/nist/javax/sip/stack/UDPMessageChannel.java Thu Dec 2 14:44:53 2010 +++ /src/gov/nist/javax/sip/stack/UDPMessageChannel.java Tue Jul 31 12:09:28 2012
@@ -59,6 +59,7 @@
 import java.net.Socket;
 import java.text.ParseException;
 import java.util.Hashtable;
+import java.util.concurrent.TimeUnit;

 import javax.sip.address.Hop;
 import javax.sip.message.Response;
@@ -281,13 +282,25 @@

                 // Send a heartbeat to the thread auditor
                 threadHandle.ping();
+
                 try {
- packet = udpMessageProcessor.messageQueue.take().packet; + DatagramQueuedMessageDispatch work = udpMessageProcessor.messageQueue.poll(threadHandle + .getPingIntervalInMillisecs(), TimeUnit.MILLISECONDS);
+
+                       if (!udpMessageProcessor.isRunning) {
+                           return;
+                       }
+                       if (work == null) {
+                               continue;
+                       } else {
+                                               packet = (DatagramPacket) 
(work.packet);
+                               this.incomingPacket = packet;
+                       }
                 } catch (InterruptedException ex) {
-                    if (!udpMessageProcessor.isRunning)
-                        return;
-                }
-                this.incomingPacket = packet;
+                                       if (!udpMessageProcessor.isRunning) {
+                                               return;
+                                       }
+                               }
             } else {
                 packet = this.incomingPacket;
             }

Reply via email to