[zookeeper] branch branch-3.7 updated: ZOOKEEPER-4632: Fix NPE from ConnectionMetricsTest.testRevalidateCount

[cnauroth]

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

cnauroth 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 566f26325 ZOOKEEPER-4632: Fix NPE from 
ConnectionMetricsTest.testRevalidateCount
566f26325 is described below

commit 566f263257856c0e16a1b041df334116e80094ac
Author: liwang <liw...@apple.com>
AuthorDate: Tue Nov 8 18:50:52 2022 -0800

    ZOOKEEPER-4632: Fix NPE from ConnectionMetricsTest.testRevalidateCount
    
    Author: Li Wang <liw...@apple.com>
    (cherry picked from commit 4ad010384ea9903501f145de041bab14e763fbb1)
    (cherry picked from commit 061db99f615596cda1e3123588cf7530a770b0b8)
---
 .../test/java/org/apache/zookeeper/server/ConnectionMetricsTest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ConnectionMetricsTest.java
 
b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ConnectionMetricsTest.java
index 45d5c67ec..ac734d296 100644
--- 
a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ConnectionMetricsTest.java
+++ 
b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ConnectionMetricsTest.java
@@ -57,8 +57,8 @@ public class ConnectionMetricsTest extends ZKTestCase {
         util.enableLocalSession(false);
         util.startAll();
 
-        int follower1 = (int) util.getFollowerQuorumPeers().get(0).getId();
-        int follower2 = (int) util.getFollowerQuorumPeers().get(1).getId();
+        int follower1 = (int) util.getFollowerQuorumPeers().get(0).getMyId();
+        int follower2 = (int) util.getFollowerQuorumPeers().get(1).getMyId();
         LOG.info("connecting to server: {}", follower1);
         ClientBase.CountdownWatcher watcher = new 
ClientBase.CountdownWatcher();
         // create a connection to follower