You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/04/27 07:43:59 UTC
[incubator-servicecomb-java-chassis] 01/04: [SCB-518] ServiceCenter
ip address need to config default port
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit b9e77b4d82d76d3b1c38197b00c2eb8796cd7fa5
Author: weichao666 <we...@huawei.com>
AuthorDate: Thu Apr 26 10:34:22 2018 +0800
[SCB-518] ServiceCenter ip address need to config default port
---
.../java/org/apache/servicecomb/foundation/common/net/NetUtils.java | 2 +-
.../servicecomb/serviceregistry/config/ServiceRegistryConfig.java | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
index b7bac4d..8cf04d6 100644
--- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
+++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
@@ -151,7 +151,7 @@ public final class NetUtils {
}
}
- private static IpPort parseIpPort(String scheme, String authority) {
+ public static IpPort parseIpPort(String scheme, String authority) {
if (authority == null)
return null;
int idx = authority.indexOf(':');
diff --git a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
index 175daba..d125037 100644
--- a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
+++ b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfig.java
@@ -42,8 +42,6 @@ public final class ServiceRegistryConfig {
public static final ServiceRegistryConfig INSTANCE = new ServiceRegistryConfig();
- private static final int PROTOCOL_HTTP_PORT = 80;
-
private static final int DEFAULT_TIMEOUT_IN_MS = 30000;
private static final int DEFAULT_TIMEOUT_IN_SECONDS = 30;
@@ -133,10 +131,8 @@ public final class ServiceRegistryConfig {
uriList.forEach(anUriList -> {
try {
URI uri = new URI(anUriList);
- StringBuilder sb = new StringBuilder(uri.getHost());
- sb.append(':').append(uri.getPort() < 0 ? PROTOCOL_HTTP_PORT : uri.getPort());
this.ssl = uri.getScheme().startsWith("https");
- ipPortList.add(NetUtils.parseIpPort(sb.toString()));
+ ipPortList.add(NetUtils.parseIpPort(uri.getScheme(), uri.getAuthority()));
} catch (Exception e) {
LOGGER.error("cse.service.registry.address invalid : {}", anUriList, e);
}
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.