From e539b1eb1ee21855cd0d23988f1e2241b40e1403 Mon Sep 17 00:00:00 2001 From: liangfei0201 Date: Fri, 3 Aug 2012 18:46:23 +0800 Subject: [PATCH] =?UTF-8?q?DUBBO-537=20UrlUtils=E4=B8=8D=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?URL=E5=8E=9F=E7=94=9F=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/dubbo/common/utils/UrlUtils.java | 8 +++----- .../java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java index 5b8112926b7..8466ebb973f 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java @@ -23,8 +23,6 @@ import com.alibaba.dubbo.common.Constants; import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.StringUtils; public class UrlUtils { @@ -44,7 +42,7 @@ public static URL parseURL(String address, Map defaults) { if (i > 1) { backup.append(","); } - backup.append(NetUtils.filterLocalHost(addresses[i])); + backup.append(addresses[i]); } url += "?" + Constants.BACKUP_KEY + "=" + backup.toString(); } @@ -87,10 +85,10 @@ public static URL parseURL(String address, Map defaults) { changed = true; password = defaultPassword; } - if (u.isAnyHost() || u.isLocalHost()) { + /*if (u.isAnyHost() || u.isLocalHost()) { changed = true; host = NetUtils.getLocalHost(); - } + }*/ if (port <= 0) { if (defaultPort > 0) { changed = true; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java index cd82655457c..140cb9b2925 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java @@ -37,7 +37,7 @@ */ public class UrlUtilsTest { - String localAddress = NetUtils.getLocalHost(); + String localAddress = "127.0.0.1"; @Test public void testAddressNull() { @@ -107,7 +107,7 @@ public void testParseUrl2() { assertEquals("alibaba", url.getPassword()); assertEquals(10000, url.getPort()); assertEquals("dubbo", url.getProtocol()); - assertEquals(localAddress + "," + localAddress, url.getParameter("backup")); + assertEquals("127.0.0.2" + "," + "127.0.0.3", url.getParameter("backup")); } @Test @@ -120,7 +120,7 @@ public void testParseUrls() { parameters.put("protocol", "dubbo"); List urls = UrlUtils.parseURLs(addresses, parameters); assertEquals(localAddress + ":10000", urls.get(0).getAddress()); - assertEquals(localAddress + ":10000", urls.get(1).getAddress()); + assertEquals("127.0.0.2" + ":10000", urls.get(1).getAddress()); } @Test