[incubator-dubbo-spring-boot-project] tag 2.7.1 created (now 01fbe79)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to tag 2.7.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. at 01fbe79 (commit) No new revisions were added by this update.
[incubator-dubbo-spring-boot-project] tag 2.7.1 deleted (was d7a1d14)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to tag 2.7.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. *** WARNING: tag 2.7.1 was deleted! *** was d7a1d14 2.7.x (#475) The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r33233 - /dev/incubator/dubbo/spring-boot-project/2.7.1/rat.txt
Author: mercyblitz Date: Thu Mar 28 06:29:28 2019 New Revision: 33233 Log: prepare for Dubbo Spring Boot 2.7.1 RC2 Removed: dev/incubator/dubbo/spring-boot-project/2.7.1/rat.txt
svn commit: r33232 - /dev/incubator/dubbo/spring-boot-project/2.7.1/
Author: mercyblitz Date: Thu Mar 28 06:27:57 2019 New Revision: 33232 Log: prepare for Dubbo Spring Boot 2.7.1 RC2 Added: dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip (with props) dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.asc dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.sha512 dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip (with props) dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip.asc dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip.sha512 dev/incubator/dubbo/spring-boot-project/2.7.1/rat.txt Added: dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip == Binary file - no diff available. Propchange: dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip -- svn:mime-type = application/octet-stream Added: dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.asc == --- dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.asc (added) +++ dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.asc Thu Mar 28 06:27:57 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEh/AlAnqDHtK4bn8Ip/UI79potPUFAlycZ9MACgkQp/UI79po +tPUr/RAAnJh9dkdcVW3Jmr6AFBG9drrgFo9L4FY/INT2KXqrbPxzWEgXDVbi9HR1 +PF5sjhgw33LH+/rSAP9EOpJosgeuxHg71uGwDHaxZsfI8iZMwdIRgqpZYHjW56sm +6jl4dDKuJEfyvHdtKFm6uRVoDaCAS/RVSAva0Z8BhEw9137BgOGmGa3FYcXotEUg +7g1a1W1oEuPIa5qdFMiLsq4263c9SPxGUTyqVyXFoa+gTH/1x1TTJIn4KHD6U5Zt +T6iPgDku3nguywU6f1kivNaqGDIiH+UyINIblriSm9sm6KxBPutbTf4WKM7JIFFB +lLpiOnyBpYnjYrijnGpsxfplC9yLJ+md5puVCNj+Wlak15FKWQ4A/lwQ8n63eyx6 +2VNtksAROKTBn4RVs2LYwdJOlimSwpec+wV5ydjySD81D4RcsbVEh36xBj3sellf +lUlIo4e8kGOrtr+X/uFFANVLi/hXGl495nflIFe4XggkTRtUMtuOzQqRwNzF8Ibr +bQcKs1sZOupWZZ8sTmsfkA6NemlPZiwLOmDvoVFyvnfqgCR12CcrWPESNXtqNiOn +Os6d2uItGdsppmCiHIxJ8s83sGoctKWzjU7YW3fGkmwX4IlJRW6hsIwumF/v1M8t +OvnLgDSGU5sYZ+tPUHH1Eegy9mIvK1QEqr3SUzaSJR4NlaRo6kQ= +=+z5Y +-END PGP SIGNATURE- Added: dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.sha512 == --- dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.sha512 (added) +++ dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.sha512 Thu Mar 28 06:27:57 2019 @@ -0,0 +1 @@ +e705f4d10a254becadce22c64d721c159ee3a39a1e900d3d37fe3f084152de2a71ffcf58644da84228a7f35b1193e453eea9d7aec62d767c532f1e8ddde62518 apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip Added: dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip == Binary file - no diff available. Propchange: dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip.asc == --- dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip.asc (added) +++ dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip.asc Thu Mar 28 06:27:57 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEh/AlAnqDHtK4bn8Ip/UI79potPUFAlycZ9QACgkQp/UI79po +tPXHBxAAzWEKnjyUB5VAq3L8hAbWsKnckgVsoWVUfPrtVU7eTRgVTfKRBCVDrtXb +pugFRffyDCFSA2EKoRBUIEB0nP5YPvXyaAQooxGA7geWX48gJVXBbWDk/BzT8WL/ +IaQZwwL9KkEr31fZSKYyzZAKaCu3a1mzCQA0WGKkOaJpAgeM1qlWMb4VkP00qy30 +FpgRgEVqMscGCPszVsMx8Pv0SqBdhRlr3ciei4QEIqgcKsuvzRqRf/oNrON/fk/T +P4NaQ96uhmvpQoO27hY2wadYAb2uqNGZsU6tlTa1zeLQ6qjmG4qw8Uh4Nr3IVnqp +6pJHqtrtdS9JuhT2fMa05z/3c/qIuQ1VgE8+/W7wuye37Bp/bx/RtpIBvHAzoYfr +QLqWwnRAB+dHXYeeWTUET5xjh47Z
[incubator-dubbo-spring-boot-project] branch 2.7.x updated: 2.7.x (#478)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git The following commit(s) were added to refs/heads/2.7.x by this push: new 01fbe79 2.7.x (#478) 01fbe79 is described below commit 01fbe79c71f73f65ae1fa1239f9fba30a8300192 Author: Mercy Ma AuthorDate: Thu Mar 28 14:17:12 2019 +0800 2.7.x (#478) * Fix apache/incubator-dubbo-spring-boot-project#169 * 0.2.1 (#345) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : apache/incubator-dubbo-spring-boot-project#319 * Polish : apache/incubator-dubbo-spring-boot-project#226 * Polish : apache/incubator-dubbo-spring-boot-project#309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * 0.2.1 (#346) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : apache/incubator-dubbo-spring-boot-project#319 * Polish : apache/incubator-dubbo-spring-boot-project#226 * Polish : apache/incubator-dubbo-spring-boot-project#309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish apache/incubator-dubbo-spring-boot-project#341 * 0.2.1 (#357) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : apache/incubator-dubbo-spring-boot-project#319 * Polish : apache/incubator-dubbo-spring-boot-project#226 * Polish : apache/incubator-dubbo-spring-boot-project#309 * Fix the test case's bugs * Fix the test case's bugs * Fix a JavaDoc issue * Update SNAPSHOT and add exclude list * Update SNAPSHOT to be 0.2.1-SNAPSHOT * Update JDK versions * Update JDK versions * Reactor & remove author info * Refactor : to save a shutdown hook thread * Remove javax.servlet:javax.servlet-api:3.1.0 that may cause class conflict, and use indirectly dependencies from spring-boot-starter-* * Polish apache/incubator-dubbo-spring-boot-project#341 * Add the samples * Add a license * 0.2.1 (#360) * Fix apache/incubator-dubbo-spring-boot-project#169 * Polish : apache/incubator-dubbo-spring-boot-project#324 & apache/incubator-dubbo-spring-boot-project#325 * Polish : apache/incubator-dubbo-spring-boot-project#315 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 * Polish : apache/incubator-dubbo-spring-boot-project#321 for test case * Polish : Update Demos * Polish : Update version to be 0.2.1 * Polish : apache/incubator-dubbo-spring-boot-project#319
[incubator-dubbo] branch 3.x-dev updated: Fix problem caused by merge in InvokerTelnetHandlerTest
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.x-dev
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/3.x-dev by this push:
new 91554bc Fix problem caused by merge in InvokerTelnetHandlerTest
91554bc is described below
commit 91554bc84b8a1f022f6430a8767739673ac60449
Author: ken.lj
AuthorDate: Thu Mar 28 11:02:17 2019 +0800
Fix problem caused by merge in InvokerTelnetHandlerTest
---
.../dubbo/telnet/InvokerTelnetHandlerTest.java | 211 +
1 file changed, 136 insertions(+), 75 deletions(-)
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
index c8029c7..a947829 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
@@ -16,8 +16,10 @@
*/
package org.apache.dubbo.rpc.protocol.dubbo.telnet;
+import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.remoting.Channel;
+import org.apache.dubbo.remoting.ChannelHandler;
import org.apache.dubbo.remoting.RemotingException;
import org.apache.dubbo.remoting.telnet.TelnetHandler;
import org.apache.dubbo.rpc.model.ApplicationModel;
@@ -30,18 +32,23 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import java.net.InetSocketAddress;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
/**
- * CountTelnetHandlerTest.java
+ * InvokeTelnetHandlerTest.java
*/
public class InvokerTelnetHandlerTest {
private static TelnetHandler invoke = new InvokeTelnetHandler();
+private static TelnetHandler select = new SelectTelnetHandler();
private Channel mockChannel;
@BeforeEach
@@ -56,136 +63,104 @@ public class InvokerTelnetHandlerTest {
@SuppressWarnings("unchecked")
@Test
-public void testInvokeDefaultSService() throws RemotingException {
+public void testInvokeDefaultService() throws RemotingException {
mockChannel = mock(Channel.class);
-
given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService");
+
given(mockChannel.getAttribute("telnet.service")).willReturn(DemoService.class.getName());
given(mockChannel.getLocalAddress()).willReturn(NetUtils.toAddress("127.0.0.1:"));
given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20886"));
ProviderModel providerModel = new
ProviderModel("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService",
"Dubbo", "1.0.0", new DemoServiceImpl(), DemoService.class);
-
ApplicationModel.initProviderModel("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService",
providerModel);
+ApplicationModel.initProviderModel(DemoService.class.getName(),
providerModel);
-String result = invoke.telnet(mockChannel, "DemoService.echo(\"ok\")");
-assertTrue(result.contains("Use default service
org.apache.dubbo.rpc.protocol.dubbo.support.DemoService.\r\n\"ok\"\r\n"));
+String result = invoke.telnet(mockChannel, "echo(\"ok\")");
+assertTrue(result.contains("result: \"ok\""));
}
@SuppressWarnings("unchecked")
@Test
-public void testInvokeByPassingNullValue() throws RemotingException {
+public void testInvokeWithSpecifyService() throws RemotingException {
mockChannel = mock(Channel.class);
-
given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService");
+given(mockChannel.getAttribute("telnet.service")).willReturn(null);
given(mockChannel.getLocalAddress()).willReturn(NetUtils.toAddress("127.0.0.1:"));
given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20886"));
ProviderModel providerModel = new
ProviderModel("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService",
"Dubbo", "1.0.0", new DemoServiceImpl(), DemoService.class);
ApplicationModel.initProviderModel("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService",
providerModel);
-// pass null value to parameter of primitive type
-try {
-invoke.telnet(mockChannel, "DemoServic
[incubator-dubbo] branch master updated: Create constants for 'hash.names' and 'hash.arguments' (#3744) (#3758)
This is an automated email from the ASF dual-hosted git repository.
kexianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new fca31c4 Create constants for 'hash.names' and 'hash.arguments'
(#3744) (#3758)
fca31c4 is described below
commit fca31c45f47da0dbc1cf0a85ad5d87b2384a5c36
Author: Daniela Marques de Morais
AuthorDate: Wed Mar 27 22:22:20 2019 -0300
Create constants for 'hash.names' and 'hash.arguments' (#3744) (#3758)
---
.../rpc/cluster/loadbalance/ConsistentHashLoadBalance.java | 7 +--
.../src/main/java/org/apache/dubbo/common/Constants.java | 10 ++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
index 83d6f8c..03c0dc9 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
@@ -31,6 +31,9 @@ import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import static org.apache.dubbo.common.Constants.HASH_ARGUMENTS;
+import static org.apache.dubbo.common.Constants.HASH_NODES;
+
/**
* ConsistentHashLoadBalance
*/
@@ -67,8 +70,8 @@ public class ConsistentHashLoadBalance extends
AbstractLoadBalance {
this.virtualInvokers = new TreeMap>();
this.identityHashCode = identityHashCode;
URL url = invokers.get(0).getUrl();
-this.replicaNumber = url.getMethodParameter(methodName,
"hash.nodes", 160);
-String[] index =
Constants.COMMA_SPLIT_PATTERN.split(url.getMethodParameter(methodName,
"hash.arguments", "0"));
+this.replicaNumber = url.getMethodParameter(methodName,
HASH_NODES, 160);
+String[] index =
Constants.COMMA_SPLIT_PATTERN.split(url.getMethodParameter(methodName,
HASH_ARGUMENTS, "0"));
argumentIndex = new int[index.length];
for (int i = 0; i < index.length; i++) {
argumentIndex[i] = Integer.parseInt(index[i]);
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
index 28bc2e0..3f48821 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
@@ -793,6 +793,16 @@ public class Constants {
public static final String TELNET = "telnet";
/**
+ * Hash nodes name
+ */
+public static final String HASH_NODES = "hash.nodes";
+
+/**
+ * Hash arguments name
+ */
+public static final String HASH_ARGUMENTS = "hash.arguments";
+
+/**
* Application name;
*/
public static final String NAME = "name";
[incubator-dubbo] branch master updated: Format code (#3756)
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
The following commit(s) were added to refs/heads/master by this push:
new e8d8538 Format code (#3756)
e8d8538 is described below
commit e8d85386bc7869d3a6e5b27c12ec7784c74bc2d6
Author: caoyixiong <32847163+ian...@users.noreply.github.com>
AuthorDate: Wed Mar 27 10:19:16 2019 -0500
Format code (#3756)
---
.../apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java | 2 +-
.../apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java | 2 +-
.../apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java| 6 +++---
.../java/org/apache/dubbo/qos/server/handler/QosProcessHandler.java | 2 +-
.../remoting/exchange/support/header/HeaderExchangeHandler.java | 4 ++--
.../dubbo/remoting/exchange/support/header/HeartbeatHandler.java| 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java
index d30ebe1..ee42714 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicLong;
public class RoundRobinLoadBalance extends AbstractLoadBalance {
public static final String NAME = "roundrobin";
-private static int RECYCLE_PERIOD = 6;
+private static final int RECYCLE_PERIOD = 6;
protected static class WeightedRoundRobin {
private int weight;
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java
index 6549cda..1cd7536 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java
@@ -47,7 +47,7 @@ public class ConditionRouter extends AbstractRouter {
public static final String NAME = "condition";
private static final Logger logger =
LoggerFactory.getLogger(ConditionRouter.class);
-protected static Pattern ROUTE_PATTERN =
Pattern.compile("([&!=,]*)\\s*([^&!=,\\s]+)");
+protected static final Pattern ROUTE_PATTERN =
Pattern.compile("([&!=,]*)\\s*([^&!=,\\s]+)");
protected Map whenCondition;
protected Map thenCondition;
diff --git
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
index abc9cf2..257f8af 100644
---
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
+++
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java
@@ -156,9 +156,9 @@ public abstract class AbstractClusterInvoker implements
Invoker {
if ((selected != null && selected.contains(invoker))
|| (!invoker.isAvailable() && getUrl() != null &&
availablecheck)) {
try {
-Invoker rinvoker = reselect(loadbalance, invocation,
invokers, selected, availablecheck);
-if (rinvoker != null) {
-invoker = rinvoker;
+Invoker rInvoker = reselect(loadbalance, invocation,
invokers, selected, availablecheck);
+if (rInvoker != null) {
+invoker = rInvoker;
} else {
//Check the index of current selected invoker, if it's not
the last one, choose the one at index+1.
int index = invokers.indexOf(invoker);
diff --git
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/QosProcessHandler.java
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/QosProcessHandler.java
index 9312bb7..0341f50 100644
---
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/QosProcessHandler.java
+++
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/QosProcessHandler.java
@@ -43,7 +43,7 @@ public class QosProcessHandler extends ByteToMessageDecoder {
// true means to accept foreign IP
private boolean acceptForeignIp;
-public static String prompt = "dubbo>";
+public static final String prompt = "dubbo>";
public QosProcessHandler(String welcome, boolean acceptForeignIp) {
this.welcome = welcome;
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeHandler.java
b/dubbo-re
[incubator-dubbo] branch revert-3688-config-center-config deleted (was 79f2817)
This is an automated email from the ASF dual-hosted git repository. tswstarplanet pushed a change to branch revert-3688-config-center-config in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. was 79f2817 Revert "Correct @Parameter config of field of ConfigCenterConfig (#3688)" The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-dubbo-spring-boot-project] tag 2.7.1 created (now d7a1d14)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to tag 2.7.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. at d7a1d14 (commit) No new revisions were added by this update.
[incubator-dubbo-spring-boot-project] tag 2.7.1 deleted (was d7a1d14)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to tag 2.7.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. *** WARNING: tag 2.7.1 was deleted! *** was d7a1d14 2.7.x (#475) The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[incubator-dubbo-spring-boot-project] tag 2.7.1 created (now d7a1d14)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to tag 2.7.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. at d7a1d14 (commit) No new revisions were added by this update.
[incubator-dubbo-spring-boot-project] tag 2.7.1 deleted (was b2200d6)
This is an automated email from the ASF dual-hosted git repository. mercyblitz pushed a change to tag 2.7.1 in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-spring-boot-project.git. *** WARNING: tag 2.7.1 was deleted! *** was b2200d6 Update README.md The revisions that were on this tag are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r33226 - in /dev/incubator/dubbo/spring-boot-project/2.7.1: apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.asc apache-dubbo-spring-boot-project-incubating-2.7.1-source-r
Author: mercyblitz Date: Wed Mar 27 08:32:33 2019 New Revision: 33226 Log: prepare for Dubbo Spring Boot 2.7.1 RC1 Added: dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.asc dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip.asc Added: dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.asc == --- dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.asc (added) +++ dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-bin-release.zip.asc Wed Mar 27 08:32:33 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEh/AlAnqDHtK4bn8Ip/UI79potPUFAlya/okACgkQp/UI79po +tPUUShAAxr/CBkZDP0FxyyC2zh6Uv24BbaCzgdSK/XhVhG/9acC8v5aO+Elb/PNi +PeYhLZF25mUvpvGBlrjniXZ5fedou+1mZekSnXtei5o/Nm7GEzbq/C4rey0rasjp +Wa345xgXcREVI+fdgxpULz8h2ZvXfL0PjKytqiTAudqLLlk+KII0J6i1BBxEcAy9 +OIaSJnHvu2SIiX/bmHEH+7QwQI5U8crha0qeLCxfNbEZsYGBbAAOZgjSNUR2p706 +yYYu/uv0izI9lAbJFDHA5hAA6wz9wKxlak7jDdHFHwYYIHzAMTF7Q5bRnEpKKzZ5 +uffRMEjbu/Ge3rt7pxNGt+ljV0n5EUfjKeuiOJt6RauEyHlb3DhqHvoLO36WDixF +tGuzUpgSnDNaHxizLSZwyizdGM8dDVBtIy09wTG6VsIc2xbq8nRkM5GehS1EsTgd +GGkfOnGZOGwZ8N/bfryAUDBs7wTyX6epFwJ1vmSDMsPqmf7E9gq1+FPvm5M9XtQJ +H/0HLzShWL7kI7XxOi+gVO4oEKondAVSHRdmAh9zGUTD5QlSsFrvraE3bmtkvkz5 +9Oo+4bmV/8PgMAs9ymBH8kl2zdfioy2drDalo1ZpQM8x1M45SY8lKhp+HCmrmnlK +bj2eIsDeGNh/VMklAeel2Lele1M1XekQYjHBBI0nfb9Cp6tD6ZE= +=Q/Pm +-END PGP SIGNATURE- Added: dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip.asc == --- dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip.asc (added) +++ dev/incubator/dubbo/spring-boot-project/2.7.1/apache-dubbo-spring-boot-project-incubating-2.7.1-source-release.zip.asc Wed Mar 27 08:32:33 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEh/AlAnqDHtK4bn8Ip/UI79potPUFAlya/okACgkQp/UI79po +tPWPUxAA2Ab9bFeKz7Skb1lz1lg0N3/MwNlAQHdAGUnxrtE0ywGUamibybUnYgCw +YS8ltsRNtjexptRjfCEe99VJOaiFGNpBAPUrPBb+KqcG1IAn/X929bkyEO13W0hB +MWGozzP1FWqQ15CA/dLrs6hx12pKTkGzxWmJVZC5E5pjBcgNNokP3jUGamltUosd +O8M7kM5mcU5g70Dd+mLWbexULT6cuqBcC+M4VEKcH/zG9cKfQjP4GsuZw7riRE+R +MNXzPL/KAcTDNQ2CrVF3w2K/ytbeHVcu+rpYOMcsKVFMgUncfU0MAYz48hShJJCc +49Npk8UXSLwCD8hK6O4tU5FMUrXH+cw+//DHO5viRpbFApW5r4H8fF8eTf6zuNZY +7tvC+e+GkFDQc/KGX3XteAM2HQ/ud7yVw9kEppC8cHoxYaPJPshKo3dEkoGat2bS +mNAb6o6zWEfxP1TT70i8NEDXpxnLRqi2zePfoSbC1nENWr1R1qnXuuLd343C+miJ ++dWcMof7n/Gm6U2+cRxvFBwf/3DqpQ4hs7OrEul9odi6mxEyJvY1ta+C8Sn4PrLL +vOWyf9KKScHxQHyjI1qQcuWCEi/biP1/3Mv1sM4IwQyVij80NIlUZj7jS57Itygb +ZJboU9ciorFEHtco/ZnufNBroHif8QlIWG25Bm4077u0Ba77x7k= +=txXI +-END PGP SIGNATURE-
[incubator-dubbo] branch master updated: fix spell (#3750)
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new ab27a39 fix spell (#3750)
ab27a39 is described below
commit ab27a398bcf17f5a5928ece4db9d5e75c378e38c
Author: niujialin <1161340...@qq.com>
AuthorDate: Wed Mar 27 16:25:34 2019 +0800
fix spell (#3750)
* fix spell
* revert
---
.../transport/dispatcher/all/AllChannelHandler.java | 16
.../connection/ConnectionOrderedChannelHandler.java | 8
.../dispatcher/execution/ExecutionChannelHandler.java| 4 ++--
.../dispatcher/message/MessageOnlyChannelHandler.java| 4 ++--
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java
index 88431fd..3ea9d40 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java
@@ -38,9 +38,9 @@ public class AllChannelHandler extends WrappedChannelHandler {
@Override
public void connected(Channel channel) throws RemotingException {
-ExecutorService cexecutor = getExecutorService();
+ExecutorService executor = getExecutorService();
try {
-cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.CONNECTED));
+executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.CONNECTED));
} catch (Throwable t) {
throw new ExecutionException("connect event", channel, getClass()
+ " error when process connected event .", t);
}
@@ -48,9 +48,9 @@ public class AllChannelHandler extends WrappedChannelHandler {
@Override
public void disconnected(Channel channel) throws RemotingException {
-ExecutorService cexecutor = getExecutorService();
+ExecutorService executor = getExecutorService();
try {
-cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.DISCONNECTED));
+executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.DISCONNECTED));
} catch (Throwable t) {
throw new ExecutionException("disconnect event", channel,
getClass() + " error when process disconnected event .", t);
}
@@ -58,9 +58,9 @@ public class AllChannelHandler extends WrappedChannelHandler {
@Override
public void received(Channel channel, Object message) throws
RemotingException {
-ExecutorService cexecutor = getExecutorService();
+ExecutorService executor = getExecutorService();
try {
-cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.RECEIVED, message));
+executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.RECEIVED, message));
} catch (Throwable t) {
//TODO A temporary solution to the problem that the exception
information can not be sent to the opposite end after the thread pool is full.
Need a refactoring
//fix The thread pool is full, refuses to call, does not return,
and causes the consumer to wait for time out
@@ -81,9 +81,9 @@ public class AllChannelHandler extends WrappedChannelHandler {
@Override
public void caught(Channel channel, Throwable exception) throws
RemotingException {
-ExecutorService cexecutor = getExecutorService();
+ExecutorService executor = getExecutorService();
try {
-cexecutor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.CAUGHT, exception));
+executor.execute(new ChannelEventRunnable(channel, handler,
ChannelState.CAUGHT, exception));
} catch (Throwable t) {
throw new ExecutionException("caught event", channel, getClass() +
" error when process caught event .", t);
}
diff --git
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java
index a40d432..d6aff15 100644
---
a/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java
+++
b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java
@@ -75,9 +75,9 @@ public class Conn
[incubator-dubbo] branch 3.x-dev updated: change rsocket parent module version to 2.7.1-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 3.x-dev in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git The following commit(s) were added to refs/heads/3.x-dev by this push: new 1d74c60 change rsocket parent module version to 2.7.1-SNAPSHOT 1d74c60 is described below commit 1d74c6027ad6aa8b9cf1bb43998aaffdab1ffa89 Author: ken.lj AuthorDate: Wed Mar 27 15:28:13 2019 +0800 change rsocket parent module version to 2.7.1-SNAPSHOT --- dubbo-rpc/dubbo-rpc-rsocket/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-rpc/dubbo-rpc-rsocket/pom.xml b/dubbo-rpc/dubbo-rpc-rsocket/pom.xml index b38f74d..c4f749c 100644 --- a/dubbo-rpc/dubbo-rpc-rsocket/pom.xml +++ b/dubbo-rpc/dubbo-rpc-rsocket/pom.xml @@ -20,7 +20,7 @@ org.apache.dubbo dubbo-rpc -2.7.0-SNAPSHOT +2.7.1-SNAPSHOT dubbo-rpc-rsocket jar
