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

Avoid generating additional exception after the first one reported. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@638886 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2008-03-19 15:48:41 +00:00
parent 38d433a34a
commit 1656e1dd52
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
View File

@ -50,7 +50,7 @@ public class InactivityMonitor extends TransportFilter {
private final AtomicBoolean commandSent = new AtomicBoolean(false);
private final AtomicBoolean inSend = new AtomicBoolean(false);
private final AtomicBoolean inactive = new AtomicBoolean(false);
private final AtomicBoolean failed = new AtomicBoolean(false);
private final AtomicBoolean commandReceived = new AtomicBoolean(true);
private final AtomicBoolean inReceive = new AtomicBoolean(false);
@ -151,13 +151,13 @@ public class InactivityMonitor extends TransportFilter {
return;
}
if (!commandReceived.get()) {
if( !inactive.getAndSet(true) ) {
if( !failed.getAndSet(true) ) {
if (LOG.isDebugEnabled()) {
LOG.debug("No message received since last read check for " + toString() + "! Throwing InactivityIOException.");
}
ASYNC_TASKS.execute(new Runnable() {
public void run() {
onException(new InactivityIOException("Channel was inactive for too long: "+next.getRemoteAddress()));
handleException(new InactivityIOException("Channel was inactive for too long: "+next.getRemoteAddress()));
};
});
@ -224,7 +224,7 @@ public class InactivityMonitor extends TransportFilter {
startMonitorThreads();
}
}
if( inactive.get() ) {
if( failed.get() ) {
throw new InactivityIOException("Channel was inactive for too long: "+next.getRemoteAddress());
}
next.oneway(o);
@ -236,12 +236,18 @@ public class InactivityMonitor extends TransportFilter {
}
public void onException(IOException error) {
if (monitorStarted.get()) {
stopMonitorThreads();
}
transportListener.onException(error);
if( !failed.getAndSet(true) ) {
handleException(error);
}
}
private void handleException(IOException error) {
if (monitorStarted.get()) {
stopMonitorThreads();
}
transportListener.onException(error);
}
private synchronized void startMonitorThreads() throws IOException {
if (monitorStarted.get()) {
return;