提交 e539b1eb 编写于 作者: L liangfei0201

DUBBO-537 UrlUtils不转换URL原生地址信息

上级 ccba3c81
......@@ -23,8 +23,6 @@ import java.util.Set;
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 class UrlUtils {
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 class UrlUtils {
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;
......
......@@ -37,7 +37,7 @@ import com.alibaba.dubbo.common.URL;
*/
public class UrlUtilsTest {
String localAddress = NetUtils.getLocalHost();
String localAddress = "127.0.0.1";
@Test
public void testAddressNull() {
......@@ -107,7 +107,7 @@ public class UrlUtilsTest {
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 class UrlUtilsTest {
parameters.put("protocol", "dubbo");
List<URL> 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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册