activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r511086 - in /activemq/branches/activemq-4.1: ./ activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
Date Fri, 23 Feb 2007 20:24:46 GMT
Author: chirino
Date: Fri Feb 23 12:24:45 2007
New Revision: 511086

URL: http://svn.apache.org/viewvc?view=rev&rev=511086
Log:
 r242@34:  chirino | 2007-02-23 14:49:14 -0500
 Continue to send heart beats even if the machine time is falky. Like time going backwards.
 
 

Modified:
    activemq/branches/activemq-4.1/   (props changed)
    activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java

Propchange: activemq/branches/activemq-4.1/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Feb 23 12:24:45 2007
@@ -1 +1 @@
-635f1f41-eb29-0410-ac9d-be9e2c357fdd:/local/amq-4.1-port:241
+635f1f41-eb29-0410-ac9d-be9e2c357fdd:/local/amq-4.1-port:242

Modified: activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java?view=diff&rev=511086&r1=511085&r2=511086
==============================================================================
--- activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
(original)
+++ activemq/branches/activemq-4.1/activemq-core/src/main/java/org/apache/activemq/transport/discovery/multicast/MulticastDiscoveryAgent.java
Fri Feb 23 12:24:45 2007
@@ -291,7 +291,7 @@
     private void doTimeKeepingServices(){
         if(started.get()){
             long currentTime=System.currentTimeMillis();
-            if((currentTime-keepAliveInterval)>lastAdvertizeTime){
+            if (currentTime < lastAdvertizeTime || ((currentTime-keepAliveInterval)>lastAdvertizeTime))
{
                 doAdvertizeSelf();
                 lastAdvertizeTime = currentTime;
             }



Mime
View raw message