Merged revisions 573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583549-583774,583777-583807,583809-583882 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1

........
  r583882 | ritchiem | 2007-10-11 18:02:28 +0100 (Thu, 11 Oct 2007) | 1 line
  
  QPID-637 Patch submitted by Aidan Skinner to address receive not waiting for full timeout.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@584091 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 31 insertions, 10 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
index 0da55c9857..9c5c344275 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
@@ -357,28 +357,49 @@ public class BasicMessageConsumer extends Closeable implements MessageConsumer
             Object o = null;
             if (l > 0)
             {
-                o = _synchronousQueue.poll(l, TimeUnit.MILLISECONDS);
+                long endtime = System.currentTimeMillis() + l;
+                while (System.currentTimeMillis() < endtime && o == null)
+                {
+                    try 
+                    {
+                        o = _synchronousQueue.poll(endtime - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+                    }
+                    catch (InterruptedException e)
+                    {
+                        _logger.warn("Interrupted: " + e);
+                        if (isClosed()) 
+                        {
+                            return null;
+                        }
+                    }
+                }
             }
             else
             {
-                o = _synchronousQueue.take();
+                while (o == null)
+                {
+                    try
+                    {
+                        o = _synchronousQueue.take();
+                    } 
+                    catch (InterruptedException e)
+                    {
+                        _logger.warn("Interrupted: " + e);
+                        if (isClosed()) 
+                        {
+                            return null;
+                        }
+                    }
+                }
             }
-
             final AbstractJMSMessage m = returnMessageOrThrow(o);
             if (m != null)
             {
                 preApplicationProcessing(m);
                 postDeliver(m);
             }
-
             return m;
         }
-        catch (InterruptedException e)
-        {
-            _logger.warn("Interrupted: " + e);
-
-            return null;
-        }
         finally
         {
             releaseReceiving();