[incubator-tubemq] branch release-0.3.0 updated: [TUBEMQ-48] No timeout when setting consumer timeout (#40)

[osgooli]

This is an automated email from the ASF dual-hosted git repository.

osgooli pushed a commit to branch release-0.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-tubemq.git


The following commit(s) were added to refs/heads/release-0.3.0 by this push:
     new aef74c2  [TUBEMQ-48] No timeout when setting consumer timeout (#40)
aef74c2 is described below

commit aef74c2d6cd680015fbfd1dc32e5646a4c655903
Author: gosonzhang <4675...@qq.com>
AuthorDate: Wed Mar 25 16:47:09 2020 +0800

    [TUBEMQ-48] No timeout when setting consumer timeout (#40)
    
    Co-authored-by: gosonzhang <gosonzh...@tencent.com>
---
 .../tubemq/server/common/heartbeat/HeartbeatManager.java     | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git 
a/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/HeartbeatManager.java
 
b/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/HeartbeatManager.java
index 41fab61..717d681 100644
--- 
a/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/HeartbeatManager.java
+++ 
b/tubemq-server/src/main/java/org/apache/tubemq/server/common/heartbeat/HeartbeatManager.java
@@ -166,8 +166,7 @@ public class HeartbeatManager {
      * @return the timeout info for the registered node
      */
     public TimeoutInfo regBrokerNode(final String nodeId) {
-        return this.brokerRegMap.put(nodeId,
-                new TimeoutInfo(System.currentTimeMillis() + 
this.brokerTimeoutDlt));
+        return this.brokerRegMap.put(nodeId, new 
TimeoutInfo(this.brokerTimeoutDlt));
     }
 
     /**
@@ -177,8 +176,7 @@ public class HeartbeatManager {
      * @return the timeout info of the registered node
      */
     public TimeoutInfo regProducerNode(final String nodeId) {
-        return this.producerRegMap.put(nodeId,
-                new TimeoutInfo(System.currentTimeMillis() + 
this.producerTimeoutDlt));
+        return this.producerRegMap.put(nodeId, new 
TimeoutInfo(this.producerTimeoutDlt));
     }
 
     /**
@@ -188,8 +186,7 @@ public class HeartbeatManager {
      * @return the timeout info of the registered node
      */
     public TimeoutInfo regConsumerNode(final String nodeId) {
-        return this.consumerRegMap.put(nodeId,
-                new TimeoutInfo(System.currentTimeMillis() + 
this.consumerTimeoutDlt));
+        return this.consumerRegMap.put(nodeId, new 
TimeoutInfo(this.consumerTimeoutDlt));
     }
 
     /**
@@ -204,8 +201,7 @@ public class HeartbeatManager {
                                        final String consumerId,
                                        final String partStr) {
         return this.consumerRegMap.put(nodeId,
-                new TimeoutInfo(consumerId, partStr,
-                        System.currentTimeMillis() + this.consumerTimeoutDlt));
+                new TimeoutInfo(consumerId, partStr, this.consumerTimeoutDlt));
     }
 
     /**