[zookeeper] branch master updated: ZOOKEEPER-3811: cleaning up code, static field be directly referred by its class name

[symat]

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

symat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 2e14a29  ZOOKEEPER-3811: cleaning up code,static field be directly 
referred by its class name
2e14a29 is described below

commit 2e14a29cc6e58d9561e80b737a3168fbb1f752b4
Author: xavier <xavie...@foxmail.com>
AuthorDate: Thu Apr 30 16:53:16 2020 +0000

    ZOOKEEPER-3811: cleaning up code,static field be directly referred by its 
class name
    
    optimized code,A static field should be directly referred by its class name
    
    Author: xavier <1217353...@qq.com>
    
    Reviewers: Christopher Tubbs <ctubb...@apache.org>, Fangmin Lyu 
<fang...@apache.org>, Mate Szalay-Beko <sy...@apache.org>
    
    Closes #1337 from XavierChengZW/master
---
 .../src/main/java/org/apache/zookeeper/server/RequestThrottler.java   | 4 ++--
 .../main/java/org/apache/zookeeper/server/ZooKeeperServerBean.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/RequestThrottler.java
 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/RequestThrottler.java
index e9cdc5e..32863d9 100644
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/RequestThrottler.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/RequestThrottler.java
@@ -100,8 +100,8 @@ public class RequestThrottler extends 
ZooKeeperCriticalThread {
 
     protected boolean shouldThrottleOp(Request request, long elapsedTime) {
         return request.isThrottlable()
-                && zks.getThrottledOpWaitTime() > 0
-                && elapsedTime > zks.getThrottledOpWaitTime();
+                && ZooKeeperServer.getThrottledOpWaitTime() > 0
+                && elapsedTime > ZooKeeperServer.getThrottledOpWaitTime();
     }
 
 
diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerBean.java
 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerBean.java
index 17dd48b..5eac7ed 100644
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerBean.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ZooKeeperServerBean.java
@@ -316,11 +316,11 @@ public class ZooKeeperServerBean implements 
ZooKeeperServerMXBean, ZKMBeanInfo {
     ///////////////////////////////////////////////////////////////////////////
 
     public int getThrottledOpWaitTime() {
-        return zks.getThrottledOpWaitTime();
+        return ZooKeeperServer.getThrottledOpWaitTime();
     }
 
     public void setThrottledOpWaitTime(int val) {
-        zks.setThrottledOpWaitTime(val);
+        ZooKeeperServer.setThrottledOpWaitTime(val);
     }
 
     ///////////////////////////////////////////////////////////////////////////