You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by il...@apache.org on 2018/11/01 07:07:33 UTC
[incubator-dubbo] branch 2.6.x updated: fix referenceBean
initialization issue (#2719)
This is an automated email from the ASF dual-hosted git repository.
iluo 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 bcb1899 fix referenceBean initialization issue (#2719)
bcb1899 is described below
commit bcb1899f3120d2d22b515fbfc383706658901e7b
Author: Young Hu <hu...@163.com>
AuthorDate: Thu Nov 1 15:07:24 2018 +0800
fix referenceBean initialization issue (#2719)
---
.../com/alibaba/dubbo/config/ReferenceConfig.java | 2 +
.../alibaba/dubbo/config/ReferenceConfigTest.java | 44 +++++++++++++++++++++-
2 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
index c6c75b1..5fe6c89 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
@@ -419,6 +419,8 @@ public class ReferenceConfig<T> extends AbstractReferenceConfig {
c = true; // default true
}
if (c && !invoker.isAvailable()) {
+ // make it possible for consumer to retry later if provider is temporarily unavailable
+ initialized = false;
throw new IllegalStateException("Failed to check the status of the service " + interfaceName + ". No provider available for the service " + (group == null ? "" : group + "/") + interfaceName + (version == null ? "" : ":" + version) + " from the url " + invoker.getUrl() + " to the consumer " + NetUtils.getLocalHost() + " use dubbo version " + Version.getVersion());
}
if (logger.isInfoEnabled()) {
diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ReferenceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ReferenceConfigTest.java
index 888dc01..e20ee39 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ReferenceConfigTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ReferenceConfigTest.java
@@ -59,5 +59,45 @@ public class ReferenceConfigTest {
demoService.unexport();
}
}
-
-}
\ No newline at end of file
+ /**
+ * unit test for dubbo-1765
+ */
+ @Test
+ public void testReferenceRetry() {
+ ApplicationConfig application = new ApplicationConfig();
+ application.setName("test-reference-retry");
+ RegistryConfig registry = new RegistryConfig();
+ registry.setAddress("multicast://224.5.6.7:1234");
+ ProtocolConfig protocol = new ProtocolConfig();
+ protocol.setName("dubbo");
+ ReferenceConfig<DemoService> rc = new ReferenceConfig<DemoService>();
+ rc.setApplication(application);
+ rc.setRegistry(registry);
+ rc.setInterface(DemoService.class.getName());
+ boolean success = false;
+ DemoService demoService = null;
+ try {
+ demoService = rc.get();
+ success = true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ Assert.assertFalse(success);
+ Assert.assertNull(demoService);
+ ServiceConfig<DemoService> sc = new ServiceConfig<DemoService>();
+ sc.setInterface(DemoService.class);
+ sc.setRef(new DemoServiceImpl());
+ sc.setApplication(application);
+ sc.setRegistry(registry);
+ sc.setProtocol(protocol);
+ try {
+ sc.export();
+ demoService = rc.get();
+ success = true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ Assert.assertTrue(success);
+ Assert.assertNotNull(demoService);
+ }
+}