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 2011/12/06 00:32:40 UTC

svn commit: r1210704 - /activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/HeartBeatMonitor.scala

Author: chirino
Date: Mon Dec  5 23:32:40 2011
New Revision: 1210704

URL: http://svn.apache.org/viewvc?rev=1210704&view=rev
Log:
Ops, my last commit was not checking against the right local variable.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/HeartBeatMonitor.scala

Modified: activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/HeartBeatMonitor.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/HeartBeatMonitor.scala?rev=1210704&r1=1210703&r2=1210704&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/HeartBeatMonitor.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/protocol/HeartBeatMonitor.scala Mon Dec  5 23:32:40 2011
@@ -39,7 +39,7 @@ class HeartBeatMonitor() {
 
   var session = 0
   
-  def schedule(interval:Long, func:() => Unit) = {
+  def schedule(session:Int, interval:Long, func:() => Unit) = {
     if ( this.session==session ) {
       transport.getDispatchQueue.after(interval, TimeUnit.MILLISECONDS) {
         if ( this.session==session ) {
@@ -63,7 +63,7 @@ class HeartBeatMonitor() {
         schedual_check_writes(session)
       }
     }
-    schedule(write_interval/2, func)
+    schedule(session, write_interval/2, func)
   }
 
   def schedual_check_reads(session:Int):Unit = {
@@ -79,7 +79,7 @@ class HeartBeatMonitor() {
         schedual_check_reads(session)
       }
     }
-    schedule(read_interval, func)
+    schedule(session, read_interval, func)
   }
 
   def start = {