merging http://svn.apache.org/viewvc?rev=819493&view=rev

git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@819495 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2413Test.java

@@ -183,6 +183,7 @@ public class AMQ2413Test extends CombinationTestSupport implements MessageListen
         try {
             while (count.get() < SEND_COUNT) {
                 if (!receivedMessages.tryAcquire(HANG_THRESHOLD, TimeUnit.SECONDS)) {
+                    if (count.get() == SEND_COUNT) break;
                     throw new TimeoutException("Message not received for more than " + HANG_THRESHOLD + " seconds");
                 }
             }