You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by je...@apache.org on 2018/08/15 08:27:24 UTC
[incubator-dubbo] branch master updated: [Dubbo-#2162]Correct the
reference retries default value 0 to 2 (#2183)
This is an automated email from the ASF dual-hosted git repository.
jerrick 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 f2188d3 [Dubbo-#2162]Correct the reference retries default value 0 to 2 (#2183)
f2188d3 is described below
commit f2188d334cf2e91dbd62f84aeba025186738f4ea
Author: tswstarplanet <ts...@163.com>
AuthorDate: Wed Aug 15 16:27:21 2018 +0800
[Dubbo-#2162]Correct the reference retries default value 0 to 2 (#2183)
* Correct the reference retries default value 0 to 2
* fix the unit test error
---
.../src/main/java/com/alibaba/dubbo/config/annotation/Reference.java | 2 +-
.../src/main/java/org/apache/dubbo/config/annotation/Reference.java | 2 +-
.../beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java
index 450170a..4c1ca97 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java
@@ -75,7 +75,7 @@ public @interface Reference {
String layer() default "";
- int retries() default 0;
+ int retries() default 2;
String loadbalance() default "";
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java
index 3a2fe03..63e2cd5 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java
@@ -164,7 +164,7 @@ public @interface Reference {
*
* @see Constants#DEFAULT_RETRIES
*/
- int retries() default 0;
+ int retries() default 2;
/**
* Load balance strategy, legal values include: random, roundrobin, leastactive
diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
index d5889fa..94148e6 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
@@ -113,7 +113,7 @@ public class AnnotationPropertyValuesAdapterTest {
Assert.assertEquals("ondisconnect", referenceBean.getOndisconnect());
Assert.assertEquals("owner", referenceBean.getOwner());
Assert.assertEquals("layer", referenceBean.getLayer());
- Assert.assertEquals(Integer.valueOf(2), referenceBean.getRetries());
+ Assert.assertEquals(Integer.valueOf(1), referenceBean.getRetries());
Assert.assertEquals("random", referenceBean.getLoadbalance());
Assert.assertEquals(true, referenceBean.isAsync());
Assert.assertEquals(Integer.valueOf(1), referenceBean.getActives());
@@ -147,7 +147,7 @@ public class AnnotationPropertyValuesAdapterTest {
check = false, init = true, lazy = true, stubevent = true,
reconnect = "reconnect", sticky = true, proxy = "javassist", stub = "stub",
cluster = "failover", connections = 1, callbacks = 1, onconnect = "onconnect",
- ondisconnect = "ondisconnect", owner = "owner", layer = "layer", retries = 2,
+ ondisconnect = "ondisconnect", owner = "owner", layer = "layer", retries = 1,
loadbalance = "random", async = true, actives = 1, sent = true,
mock = "mock", validation = "validation", timeout = 2, cache = "cache",
filter = {"default", "default"}, listener = {"default", "default"}, parameters = {"key1", "value1"}, application = "application",