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

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


The following commit(s) were added to refs/heads/master by this push:
     new d8b209b8e UUnit test fix TestTaskStateModelFactory. 
testZkClientCreationMultiZk
d8b209b8e is described below

commit d8b209b8e9048b320ceb3ff16d4f3b21d9b52660
Author: xyuanlu <[email protected]>
AuthorDate: Mon Mar 20 16:54:49 2023 -0700

    UUnit test fix TestTaskStateModelFactory. testZkClientCreationMultiZk
    
    Put clean up in final block in MultiZkTestBase
---
 .../java/org/apache/helix/integration/multizk/MultiZkTestBase.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/helix-core/src/test/java/org/apache/helix/integration/multizk/MultiZkTestBase.java
 
b/helix-core/src/test/java/org/apache/helix/integration/multizk/MultiZkTestBase.java
index e54800c66..134e68d43 100644
--- 
a/helix-core/src/test/java/org/apache/helix/integration/multizk/MultiZkTestBase.java
+++ 
b/helix-core/src/test/java/org/apache/helix/integration/multizk/MultiZkTestBase.java
@@ -144,6 +144,7 @@ public class MultiZkTestBase {
                 return true;
             }, TestHelper.WAIT_DURATION));
 
+        } finally {
             // Tear down zookeepers
             ZK_CLIENT_MAP.forEach((zkAddress, zkClient) -> zkClient.close());
             ZK_SERVER_MAP.forEach((zkAddress, zkServer) -> 
zkServer.shutdown());
@@ -158,7 +159,7 @@ public class MultiZkTestBase {
             if (_zkClient != null && !_zkClient.isClosed()) {
                 _zkClient.close();
             }
-        } finally {
+
             // Restore System property configs
             if (_configStore.containsKey(SystemPropertyKeys.MULTI_ZK_ENABLED)) 
{
                 System.setProperty(SystemPropertyKeys.MULTI_ZK_ENABLED,

Reply via email to