You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by hu...@apache.org on 2018/05/09 07:17:59 UTC
[incubator-dubbo] branch master updated (63a2569 -> 6ec0225)
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.
from 63a2569 Fix #934 #1756 use loadBalance policy to choose invoke when providers less 2 (#1759)
new 5adaa26 Remove unnecessary null check.
new 628f7e4 Remove redundant final modifier.
new 51e2e80 Remove unnecessary null check.
new 3c7cd8f Remove redundant array creation.
new 243e571 Remove unnecessary null check.
new 6ec0225 Remove unnecessary null check and fix typo.
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../com/alibaba/dubbo/config/AbstractInterfaceConfig.java | 3 +--
.../java/com/alibaba/dubbo/config/AbstractServiceConfig.java | 2 +-
.../main/java/com/alibaba/dubbo/config/ServiceConfig.java | 12 ++++++------
.../alibaba/dubbo/registry/status/RegistryStatusChecker.java | 6 +++---
4 files changed, 11 insertions(+), 12 deletions(-)
--
To stop receiving notification emails like this one, please contact
huxing@apache.org.
[incubator-dubbo] 01/06: Remove unnecessary null check.
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 5adaa26b7a94c3ce1c84f59a677a1c3bd1f5c983
Author: Huxing Zhang <hu...@gmail.com>
AuthorDate: Wed May 9 14:57:45 2018 +0800
Remove unnecessary null check.
---
.../main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java
index fd3000e..a42d07c 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java
@@ -169,8 +169,7 @@ public abstract class AbstractInterfaceConfig extends AbstractMethodConfig {
if (sysaddress != null && sysaddress.length() > 0) {
address = sysaddress;
}
- if (address != null && address.length() > 0
- && !RegistryConfig.NO_AVAILABLE.equalsIgnoreCase(address)) {
+ if (address.length() > 0 && !RegistryConfig.NO_AVAILABLE.equalsIgnoreCase(address)) {
Map<String, String> map = new HashMap<String, String>();
appendParameters(map, application);
appendParameters(map, config);
--
To stop receiving notification emails like this one, please contact
huxing@apache.org.
[incubator-dubbo] 05/06: Remove unnecessary null check.
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 243e57130646c69c047910dd079f19cbadc57613
Author: Huxing Zhang <hu...@gmail.com>
AuthorDate: Wed May 9 15:08:07 2018 +0800
Remove unnecessary null check.
---
.../src/main/java/com/alibaba/dubbo/config/ServiceConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
index 462400b..7af02b4 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
@@ -338,7 +338,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
if (unexported) {
return;
}
- if (exporters != null && !exporters.isEmpty()) {
+ if (!exporters.isEmpty()) {
for (Exporter<?> exporter : exporters) {
try {
exporter.unexport();
--
To stop receiving notification emails like this one, please contact
huxing@apache.org.
[incubator-dubbo] 06/06: Remove unnecessary null check and fix typo.
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 6ec0225cfa9b45c8349d19019f965d5c52d40a09
Author: Huxing Zhang <hu...@gmail.com>
AuthorDate: Wed May 9 15:15:01 2018 +0800
Remove unnecessary null check and fix typo.
---
.../com/alibaba/dubbo/registry/status/RegistryStatusChecker.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/status/RegistryStatusChecker.java b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/status/RegistryStatusChecker.java
index 3298656..e0772d6 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/status/RegistryStatusChecker.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/status/RegistryStatusChecker.java
@@ -33,13 +33,13 @@ public class RegistryStatusChecker implements StatusChecker {
@Override
public Status check() {
- Collection<Registry> regsitries = AbstractRegistryFactory.getRegistries();
- if (regsitries == null || regsitries.isEmpty()) {
+ Collection<Registry> registries = AbstractRegistryFactory.getRegistries();
+ if (registries.isEmpty()) {
return new Status(Status.Level.UNKNOWN);
}
Status.Level level = Status.Level.OK;
StringBuilder buf = new StringBuilder();
- for (Registry registry : regsitries) {
+ for (Registry registry : registries) {
if (buf.length() > 0) {
buf.append(",");
}
--
To stop receiving notification emails like this one, please contact
huxing@apache.org.
[incubator-dubbo] 03/06: Remove unnecessary null check.
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 51e2e80158c1d2f10cf8c38ae533e8c09ef91e9a
Author: Huxing Zhang <hu...@gmail.com>
AuthorDate: Wed May 9 15:01:54 2018 +0800
Remove unnecessary null check.
---
.../src/main/java/com/alibaba/dubbo/config/ServiceConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
index cb6fefb..462400b 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
@@ -175,7 +175,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
}
public URL toUrl() {
- return urls == null || urls.isEmpty() ? null : urls.iterator().next();
+ return urls.isEmpty() ? null : urls.iterator().next();
}
public List<URL> toUrls() {
--
To stop receiving notification emails like this one, please contact
huxing@apache.org.
[incubator-dubbo] 02/06: Remove redundant final modifier.
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 628f7e442ecbcdc70c550de08d09cfd273d9d6cc
Author: Huxing Zhang <hu...@gmail.com>
AuthorDate: Wed May 9 15:00:50 2018 +0800
Remove redundant final modifier.
---
.../src/main/java/com/alibaba/dubbo/config/ServiceConfig.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
index e2101d5..cb6fefb 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
@@ -104,7 +104,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
}
@Deprecated
- private static final List<ProtocolConfig> convertProviderToProtocol(List<ProviderConfig> providers) {
+ private static List<ProtocolConfig> convertProviderToProtocol(List<ProviderConfig> providers) {
if (providers == null || providers.isEmpty()) {
return null;
}
@@ -116,7 +116,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
}
@Deprecated
- private static final List<ProviderConfig> convertProtocolToProvider(List<ProtocolConfig> protocols) {
+ private static List<ProviderConfig> convertProtocolToProvider(List<ProtocolConfig> protocols) {
if (protocols == null || protocols.isEmpty()) {
return null;
}
@@ -128,7 +128,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
}
@Deprecated
- private static final ProtocolConfig convertProviderToProtocol(ProviderConfig provider) {
+ private static ProtocolConfig convertProviderToProtocol(ProviderConfig provider) {
ProtocolConfig protocol = new ProtocolConfig();
protocol.setName(provider.getProtocol().getName());
protocol.setServer(provider.getServer());
@@ -144,7 +144,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
}
@Deprecated
- private static final ProviderConfig convertProtocolToProvider(ProtocolConfig protocol) {
+ private static ProviderConfig convertProtocolToProvider(ProtocolConfig protocol) {
ProviderConfig provider = new ProviderConfig();
provider.setProtocol(protocol);
provider.setServer(protocol.getServer());
--
To stop receiving notification emails like this one, please contact
huxing@apache.org.
[incubator-dubbo] 04/06: Remove redundant array creation.
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 3c7cd8f5f5ea3818d26b17d0b46986833a3fbc9c
Author: Huxing Zhang <hu...@gmail.com>
AuthorDate: Wed May 9 15:06:45 2018 +0800
Remove redundant array creation.
---
.../src/main/java/com/alibaba/dubbo/config/AbstractServiceConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractServiceConfig.java
index 0212854..6890398 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractServiceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractServiceConfig.java
@@ -171,7 +171,7 @@ public abstract class AbstractServiceConfig extends AbstractInterfaceConfig {
}
public void setProtocol(ProtocolConfig protocol) {
- this.protocols = Arrays.asList(new ProtocolConfig[]{protocol});
+ this.protocols = Arrays.asList(protocol);
}
public String getAccesslog() {
--
To stop receiving notification emails like this one, please contact
huxing@apache.org.