svn commit: r1483605 - /activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandSubscription.java

[gtully]

Author: gtully
Date: Thu May 16 23:32:31 2013
New Revision: 1483605

URL: http://svn.apache.org/r1483605
Log:
https://issues.apache.org/jira/browse/AMQ-4540 - wait for a max of 30 seconds 
for pending forwards to complete

Modified:
    
activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandSubscription.java

Modified: 
activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandSubscription.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandSubscription.java?rev=1483605&r1=1483604&r2=1483605&view=diff
==============================================================================
--- 
activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandSubscription.java
 (original)
+++ 
activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/DemandSubscription.java
 Thu May 16 23:32:31 2013
@@ -18,6 +18,7 @@ package org.apache.activemq.network;
 
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -101,13 +102,13 @@ public class DemandSubscription {
             if (dispatched.get() > 0) {
                 synchronized (activeWaiter) {
                     try {
-                        activeWaiter.wait();
+                        activeWaiter.wait(TimeUnit.SECONDS.toMillis(30));
                     } catch (InterruptedException ignored) {
                     }
                 }
                 if (this.dispatched.get() > 0) {
                     LOG.warn("demand sub interrupted or timedout while waiting 
for outstanding responses, " +
-                             "expect potentially " + this.dispatched.get() + " 
duplicate deliveried");
+                             "expect potentially " + this.dispatched.get() + " 
duplicate forwards");
                 }
             }
         }