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 13:27:07 UTC

[incubator-dubbo] branch 2.6.x updated: fix retries to 2, #2162 (#2303)

This is an automated email from the ASF dual-hosted git repository.

jerrick pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/2.6.x by this push:
     new 97124e9  fix retries to 2, #2162 (#2303)
97124e9 is described below

commit 97124e91f4db33af52d51b095c546d60f87df344
Author: Jerrick Zhu <di...@gmail.com>
AuthorDate: Wed Aug 15 21:27:02 2018 +0800

    fix retries to 2, #2162 (#2303)
---
 .../src/main/java/com/alibaba/dubbo/config/annotation/Reference.java  | 2 +-
 .../beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java
index defdc9f..c043cb3 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java
@@ -78,7 +78,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-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
index 36def71..0eb969d 100644
--- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java
+++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/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());
@@ -146,7 +146,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",