You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jl...@apache.org on 2007/06/29 15:03:54 UTC
svn commit: r551880 -
/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
Author: jlim
Date: Fri Jun 29 06:03:53 2007
New Revision: 551880
URL: http://svn.apache.org/viewvc?view=rev&rev=551880
Log:
patch applied for https://issues.apache.org/activemq/browse/AMQ-1302
Modified:
activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
Modified: activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java?view=diff&rev=551880&r1=551879&r2=551880
==============================================================================
--- activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java (original)
+++ activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java Fri Jun 29 06:03:53 2007
@@ -70,77 +70,85 @@
private void writeCheck() {
- if( inSend.get() ) {
- log.trace("A send is in progress");
- return;
- }
-
- if( !commandSent.get() ) {
- log.trace("No message sent since last write check, sending a KeepAliveInfo");
- try {
- next.oneway(new KeepAliveInfo());
- } catch (IOException e) {
- onException(e);
+ synchronized(writeChecker) {
+ if( inSend.get() ) {
+ log.trace("A send is in progress");
+ return;
+ }
+
+ if( !commandSent.get() ) {
+ log.trace("No message sent since last write check, sending a KeepAliveInfo");
+ try {
+ next.oneway(new KeepAliveInfo());
+ } catch (IOException e) {
+ onException(e);
+ }
+ } else {
+ log.trace("Message sent since last write check, resetting flag");
}
- } else {
- log.trace("Message sent since last write check, resetting flag");
+
+ commandSent.set(false);
}
-
- commandSent.set(false);
-
}
private void readCheck() {
- if( inReceive.get() ) {
- log.trace("A receive is in progress");
- return;
- }
-
- if( !commandReceived.get() ) {
- log.debug("No message received since last read check for " + toString() + "! Throwing InactivityIOException.");
- onException(new InactivityIOException("Channel was inactive for too long."));
- } else {
- log.trace("Message received since last read check, resetting flag: ");
+ synchronized(readChecker) {
+ if( inReceive.get() ) {
+ log.trace("A receive is in progress");
+ return;
+ }
+
+ if( !commandReceived.get() ) {
+ log.debug("No message received since last read check for " + toString() + "! Throwing InactivityIOException.");
+ onException(new InactivityIOException("Channel was inactive for too long."));
+ } else {
+ log.trace("Message received since last read check, resetting flag: ");
+ }
+
+ commandReceived.set(false);
}
-
- commandReceived.set(false);
+
}
public void onCommand(Object command) {
- inReceive.set(true);
- try {
- if( command.getClass() == WireFormatInfo.class ) {
- synchronized( this ) {
- remoteWireFormatInfo = (WireFormatInfo) command;
- try {
- startMonitorThreads();
- } catch (IOException e) {
- onException(e);
+ synchronized(readChecker) {
+ inReceive.set(true);
+ try {
+ if( command.getClass() == WireFormatInfo.class ) {
+ synchronized( this ) {
+ remoteWireFormatInfo = (WireFormatInfo) command;
+ try {
+ startMonitorThreads();
+ } catch (IOException e) {
+ onException(e);
+ }
}
}
+ transportListener.onCommand(command);
+ } finally {
+ inReceive.set(false);
+ commandReceived.set(true);
}
- transportListener.onCommand(command);
- } finally {
- inReceive.set(false);
- commandReceived.set(true);
}
}
public void oneway(Object o) throws IOException {
- // Disable inactivity monitoring while processing a command.
- inSend.set(true);
- commandSent.set(true);
- try {
- if( o.getClass() == WireFormatInfo.class ) {
- synchronized( this ) {
- localWireFormatInfo = (WireFormatInfo) o;
- startMonitorThreads();
+ synchronized(writeChecker) {
+ // Disable inactivity monitoring while processing a command.
+ inSend.set(true);
+ commandSent.set(true);
+ try {
+ if( o.getClass() == WireFormatInfo.class ) {
+ synchronized( this ) {
+ localWireFormatInfo = (WireFormatInfo) o;
+ startMonitorThreads();
+ }
}
+ next.oneway(o);
+ } finally {
+ inSend.set(false);
}
- next.oneway(o);
- } finally {
- inSend.set(false);
}
}