svn commit: r1236414 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java

[tabish]

Author: tabish
Date: Thu Jan 26 22:18:59 2012
New Revision: 1236414

URL: http://svn.apache.org/viewvc?rev=1236414&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-3683

Modified:
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java?rev=1236414&r1=1236413&r2=1236414&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
 Thu Jan 26 22:18:59 2012
@@ -135,7 +135,7 @@ public abstract class AbstractInactivity
             return;
         }
 
-        if (!commandSent.get() && useKeepAlive) {
+        if (!commandSent.get() && useKeepAlive && monitorStarted.get() && 
!ASYNC_TASKS.isTerminating()) {
             if (LOG.isTraceEnabled()) {
                 LOG.trace(this + " no message sent since last write check, 
sending a KeepAliveInfo");
             }
@@ -178,7 +178,7 @@ public abstract class AbstractInactivity
             }
             return;
         }
-        if (!commandReceived.get()) {
+        if (!commandReceived.get() && monitorStarted.get() && 
!ASYNC_TASKS.isTerminating()) {
             if (LOG.isDebugEnabled()) {
                 LOG.debug("No message received since last read check for " + 
toString() + "! Throwing InactivityIOException.");
             }