Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-1950 - fix for slave hang with temp queue creation/deletion 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@700823 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2008-10-01 16:15:53 +00:00
parent 4d6043aa94
commit c48c23f47c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
View File

@ -245,13 +245,13 @@ public class Queue extends BaseDestination implements Task {
if( sub instanceof QueueBrowserSubscription ) { if( sub instanceof QueueBrowserSubscription ) {
((QueueBrowserSubscription)sub).incrementQueueRef(); ((QueueBrowserSubscription)sub).incrementQueueRef();
} }
if (!this.optimizedDispatch) { if (!(this.optimizedDispatch || isSlave())) {
wakeup(); wakeup();
} }
}finally { }finally {
dispatchLock.unlock(); dispatchLock.unlock();
} }
if (this.optimizedDispatch) { if (this.optimizedDispatch || isSlave()) {
// Outside of dispatchLock() to maintain the lock hierarchy of // Outside of dispatchLock() to maintain the lock hierarchy of
// iteratingMutex -> dispatchLock. - see https://issues.apache.org/activemq/browse/AMQ-1878 // iteratingMutex -> dispatchLock. - see https://issues.apache.org/activemq/browse/AMQ-1878
wakeup(); wakeup();
@ -307,13 +307,13 @@ public class Queue extends BaseDestination implements Task {
if (consumers.isEmpty()) { if (consumers.isEmpty()) {
messages.gc(); messages.gc();
} }
if (!this.optimizedDispatch) { if (!(this.optimizedDispatch || isSlave())) {
wakeup(); wakeup();
} }
}finally { }finally {
dispatchLock.unlock(); dispatchLock.unlock();
} }
if (this.optimizedDispatch) { if (this.optimizedDispatch || isSlave()) {
// Outside of dispatchLock() to maintain the lock hierarchy of // Outside of dispatchLock() to maintain the lock hierarchy of
// iteratingMutex -> dispatchLock. - see https://issues.apache.org/activemq/browse/AMQ-1878 // iteratingMutex -> dispatchLock. - see https://issues.apache.org/activemq/browse/AMQ-1878
wakeup(); wakeup();