From 1250163f394bd54e54c2d7a5e6fde93b6250f532 Mon Sep 17 00:00:00 2001 From: Gary Tully Date: Wed, 19 Oct 2011 22:26:07 +0000 Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-3481 - check for tryLock success before unlock git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1186539 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/activemq/transport/AbstractInactivityMonitor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java b/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java index f394b3ed1f..6911f96489 100644 --- a/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java +++ b/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java @@ -153,7 +153,9 @@ public abstract class AbstractInactivityMonitor extends TransportFilter { } catch (IOException e) { onException(e); } finally { - sendLock.writeLock().unlock(); + if (sendLock.writeLock().isHeldByCurrentThread()) { + sendLock.writeLock().unlock(); + } } } };