[ISSUE alibaba#8372] Fix https connection (alibaba#8380)

* Fix alibaba#8372 * add unit test and remove set serverAddrsStr null * restore judgement and UT * add UT * split UT
ScorpioAeolus · May 18, 2022 · dbcdbb7 · dbcdbb7
1 parent 3a37290
commit dbcdbb7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java
@@ -196,7 +196,7 @@ public ServerListManager(Properties properties) throws NacosException {
             StringTokenizer serverAddrsTokens = new StringTokenizer(this.serverAddrsStr, ",;");
             while (serverAddrsTokens.hasMoreTokens()) {
                 String serverAddr = serverAddrsTokens.nextToken().trim();
-                if (serverAddr.startsWith(HTTP_PREFIX) || serverAddr.startsWith(HTTP_PREFIX)) {
+                if (serverAddr.startsWith(HTTP_PREFIX) || serverAddr.startsWith(HTTPS_PREFIX)) {
                     serverAddrs.add(serverAddr);
                 } else {
                     String[] serverAddrArr = InternetAddressUtil.splitIPPortStr(serverAddr);

diff --git a/client/src/test/java/com/alibaba/nacos/client/config/impl/ServerListManagerTest.java b/client/src/test/java/com/alibaba/nacos/client/config/impl/ServerListManagerTest.java
@@ -60,6 +60,16 @@ public void testGetter() throws NacosException {
             final ServerListManager mgr2 = new ServerListManager(properties);
             Assert.assertEquals("aaa", mgr2.getContentPath());
         }
+
+        // Test https
+        {
+            Properties properties = new Properties();
+            properties.put(PropertyKeyConst.CONTEXT_PATH, "aaa");
+            properties.put(PropertyKeyConst.SERVER_ADDR, "https://1.1.1.1:8848");
+            final ServerListManager mgr2 = new ServerListManager(properties);
+            Assert.assertEquals("aaa", mgr2.getContentPath());
+            Assert.assertEquals("[https://1.1.1.1:8848]", mgr2.getServerUrls().toString());
+        }
 
         {
             Properties properties2 = new Properties();