You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ip...@apache.org on 2020/05/12 07:09:38 UTC

[ignite] 01/01: Revert "IGNITE-12999 Fix ZookeeperDiscoverySpiSslTest.testIgniteSslWrongPort (#7790)"

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

ipavlukhin pushed a commit to branch revert-7790-ignite-12999
in repository https://gitbox.apache.org/repos/asf/ignite.git

commit 4cf043ae5f6dfd2a98e96307304d5084571011d4
Author: pavlukhin <vo...@gmail.com>
AuthorDate: Tue May 12 10:09:24 2020 +0300

    Revert "IGNITE-12999 Fix ZookeeperDiscoverySpiSslTest.testIgniteSslWrongPort (#7790)"
    
    This reverts commit e5a98aaef063cd3e5553bc78879433511a67f467.
---
 .../discovery/zk/internal/ZookeeperDiscoverySpiSslTestBase.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSslTestBase.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSslTestBase.java
index 5cbb57a..4b994c9 100644
--- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSslTestBase.java
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiSslTestBase.java
@@ -76,10 +76,9 @@ class ZookeeperDiscoverySpiSslTestBase extends ZookeeperDiscoverySpiTestBase {
     @Override protected DiscoverySpi cloneDiscoverySpi(DiscoverySpi discoverySpi) throws Exception {
         ZookeeperDiscoverySpi clone = (ZookeeperDiscoverySpi) super.cloneDiscoverySpi(discoverySpi);
 
-        if (USE_TEST_CLUSTER)
-            clone.setZkConnectionString(getTestClusterZkConnectionString());
-        else
-            clone.setZkConnectionString(getRealClusterZkConnectionString());
+        String connStr = ((ZookeeperDiscoverySpi) discoverySpi).getZkConnectionString();
+
+        clone.setZkConnectionString(connStr);
 
         return clone;
     }