Fixes #370

* Fixes #370
javaee · Jul 19, 2017 · 4715a46 · 4715a46
1 parent 7d50f4e
commit 4715a46
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/...broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/service/imq/JMSServiceImpl.java b/...broker-core/src/main/java/com/sun/messaging/jmq/jmsserver/service/imq/JMSServiceImpl.java
@@ -2638,6 +2638,8 @@ public Packet getNextConsumerPacket(ConsumerUID cuid, long timeout)
 
                 // add an event listener to wake us up when the consumer is busy
                 Object lock = c.addEventListener(this,EventType.BUSY_STATE_CHANGED, null);
+                try {
+
                 while (!c.isBusy() || stopped) {
                     try {
                         // wait until the consumer is not busy
@@ -2697,6 +2699,10 @@ public Packet getNextConsumerPacket(ConsumerUID cuid, long timeout)
 			}
                     } catch (Exception ex) {}
                 // remove the event listener since we arent sure if we will care
+                //c.removeEventListener(lock);
+            } //while
+
+            } finally { 
                 c.removeEventListener(lock);
             }
             //if (stopped) return null;