[zookeeper] branch branch-3.7 updated: ZOOKEEPER-4380: Avoid NPE in RateLogger#rateLimitLog

[ddiederen]

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

ddiederen pushed a commit to branch branch-3.7
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.7 by this push:
     new 7509366  ZOOKEEPER-4380: Avoid NPE in RateLogger#rateLimitLog
7509366 is described below

commit 75093668ef1201905a7001c4d50e9f9d86ed092f
Author: ruanwenjun <wen...@apache.org>
AuthorDate: Wed Sep 22 15:22:12 2021 +0000

    ZOOKEEPER-4380: Avoid NPE in RateLogger#rateLimitLog
    
    Author: ruanwenjun <wen...@apache.org>
    
    Reviewers: Enrico Olivelli <eolive...@apache.org>, Damien Diederen 
<ddiede...@apache.org>
    
    Closes #1758 from ruanwenjun/dev_wenjun_patch-fixNPEInRateLogger
    
    (cherry picked from commit c0b19e0c5c2bbf1fb24e154466b6cc0fa6b5e74a)
    Signed-off-by: Damien Diederen <ddiede...@apache.org>
---
 .../src/main/java/org/apache/zookeeper/server/RateLogger.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/RateLogger.java 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/RateLogger.java
index 1cae448..21e41b4 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/RateLogger.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/RateLogger.java
@@ -18,6 +18,7 @@
 
 package org.apache.zookeeper.server;
 
+import java.util.Objects;
 import org.apache.zookeeper.common.Time;
 import org.slf4j.Logger;
 
@@ -67,21 +68,21 @@ public class RateLogger {
     /**
      * In addition to the message, it also takes a value.
      */
-    public void rateLimitLog(String newMsg, String value) {
+    public void rateLimitLog(String newMsg, String newValue) {
         long now = Time.currentElapsedTime();
-        if (newMsg.equals(msg)) {
+        if (Objects.equals(newMsg, msg)) {
             ++count;
-            this.value = value;
+            value = newValue;
             if (now - timestamp >= LOG_INTERVAL) {
                 flush();
                 msg = newMsg;
                 timestamp = now;
-                this.value = value;
+                value = newValue;
             }
         } else {
             flush();
             msg = newMsg;
-            this.value = value;
+            value = newValue;
             timestamp = now;
             LOG.warn("Message:{} Value:{}", msg, value);
         }