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

Don't timeout trying to aquire the service write lock. Timing out can cause to improper shutdown. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@637962 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2008-03-17 16:34:34 +00:00
parent 70511a6929
commit 4bce5c810a
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
View File

@ -895,24 +895,14 @@ public class TransportConnection implements Connection, Task, CommandVisitor {
new Thread("ActiveMQ Transport Stopper: "+ transport.getRemoteAddress()) {
@Override
public void run() {
boolean locked = false;
// make sure we are not servicing client requests while we are shutting down.
try {
//we could be waiting a long time if the network has gone - so only wait 1 second
locked = serviceLock.writeLock().tryLock(1,TimeUnit.SECONDS);
} catch (InterruptedException e) {
LOG.debug("Try get writeLock interrupted ",e);
}
serviceLock.writeLock().lock();
try {
doStop();
} catch (Throwable e) {
LOG.info("Error occured while shutting down a connection to '" + transport.getRemoteAddress()+ "': "+e);
LOG.debug("Error occured while shutting down a connection to '" + transport.getRemoteAddress()+ "': ", e);
} finally {
stopped.countDown();
if (locked) {
serviceLock.writeLock().unlock();
}
serviceLock.writeLock().unlock();
}
}
}.start();