zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4663 from horizonzy/fix-4662

Browse Source 
[ISSUE-#4662] Just choose one between nacosDomain mode and servers mode.
This commit is contained in:
赵延 2021-01-11 09:37:12 +08:00 committed by GitHub
commit 0732a93072
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
View File

@ -108,7 +108,7 @@ public class NamingProxy implements Closeable {
private Properties properties;
private ScheduledExecutorService executorService;
private int maxRetry;
public NamingProxy(String namespaceId, String endpoint, String serverList, Properties properties) {
@ -119,8 +119,8 @@ public class NamingProxy implements Closeable {
this.namespaceId = namespaceId;
this.endpoint = endpoint;
this.maxRetry = ConvertUtils.toInt(properties.getProperty(PropertyKeyConst.NAMING_REQUEST_DOMAIN_RETRY_COUNT,
String.valueOf(UtilAndComs.REQUEST_DOMAIN_RETRY_COUNT)));
String.valueOf(UtilAndComs.REQUEST_DOMAIN_RETRY_COUNT)));
if (StringUtils.isNotEmpty(serverList)) {
this.serverList = Arrays.asList(serverList.split(","));
if (this.serverList.size() == 1) {
@ -514,12 +514,12 @@ public class NamingProxy implements Closeable {
params.put(CommonParams.NAMESPACE_ID, getNamespaceId());
if (CollectionUtils.isEmpty(servers) && StringUtils.isEmpty(nacosDomain)) {
if (CollectionUtils.isEmpty(servers) && StringUtils.isBlank(nacosDomain)) {
throw new NacosException(NacosException.INVALID_PARAM, "no server available");
}
NacosException exception = new NacosException();
if (StringUtils.isNotBlank(nacosDomain)) {
for (int i = 0; i < maxRetry; i++) {
try {
@ -531,10 +531,7 @@ public class NamingProxy implements Closeable {
}
}
}
}
if (servers != null && !servers.isEmpty()) {
} else {
Random random = new Random(System.currentTimeMillis());
int index = random.nextInt(servers.size());