You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/07/11 16:33:22 UTC
svn commit: r420873 - in
/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport:
InactivityMonitor.java failover/FailoverTransport.java
Author: chirino
Date: Tue Jul 11 07:33:22 2006
New Revision: 420873
URL: http://svn.apache.org/viewvc?rev=420873&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQ-608
Modified:
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java?rev=420873&r1=420872&r2=420873&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/InactivityMonitor.java Tue Jul 11 07:33:22 2006
@@ -71,19 +71,19 @@
private void writeCheck() {
if( inSend.get() ) {
- log.debug("A send is in progress");
+ log.trace("A send is in progress");
return;
}
if( !commandSent.get() ) {
- log.debug("No message sent since last write check, sending a KeepAliveInfo");
+ log.trace("No message sent since last write check, sending a KeepAliveInfo");
try {
next.oneway(new KeepAliveInfo());
} catch (IOException e) {
onException(e);
}
} else {
- log.debug("Message sent since last write check, resetting flag");
+ log.trace("Message sent since last write check, resetting flag");
}
commandSent.set(false);
@@ -92,15 +92,15 @@
private void readCheck() {
if( inReceive.get() ) {
- log.debug("A receive is in progress");
+ log.trace("A receive is in progress");
return;
}
if( !commandReceived.get() ) {
- log.debug("No message received since last read check! ");
+ log.debug("No message received since last read check for " + toString() + "! Throwing InactivityIOException.");
onException(new InactivityIOException("Channel was inactive for too long."));
} else {
- log.debug("Message received since last read check, resetting flag: ");
+ log.trace("Message received since last read check, resetting flag: ");
}
commandReceived.set(false);
Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java?rev=420873&r1=420872&r2=420873&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java Tue Jul 11 07:33:22 2006
@@ -194,8 +194,8 @@
}
if(!disposed){
- if( log.isTraceEnabled() )
- log.trace("Waiting "+reconnectDelay+" ms before attempting connection. ");
+
+ log.debug("Waiting "+reconnectDelay+" ms before attempting connection. ");
synchronized(sleepMutex){
try{
sleepMutex.wait(reconnectDelay);
@@ -339,7 +339,7 @@
// Wait for transport to be connected.
while (connectedTransport == null && !disposed && connectionFailure==null ) {
- log.debug("Waiting for transport to reconnect.");
+ log.trace("Waiting for transport to reconnect.");
try {
reconnectMutex.wait(1000);
}