From c67579a8b2284617772a2d3d6f31710f718768b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=9B=E9=AD=94=E7=8E=8B=5F=E4=BD=99=E5=A8=81?= Date: Fri, 17 Jun 2016 12:05:48 +0800 Subject: [PATCH 1/5] tt --- .../dubbo/registry/integration/RegistryDirectory.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java index 307ffadf7646..8a1c42db0829 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java @@ -575,9 +575,13 @@ private void destroyUnusedInvokers(Map> oldUrlInvokerMap, Map } public List> doList(Invocation invocation) { - if (forbidden) { + String attachment = invocation.getAttachment("invocation.need.mock"); + if (Boolean.TRUE.toString().equals(attachment)) { + logger.info("Don't throw RpcException when mock invocation occurs."); + } else if (forbidden) { throw new RpcException(RpcException.FORBIDDEN_EXCEPTION, "Forbid consumer " + NetUtils.getLocalHost() + " access service " + getInterface().getName() + " from registry " + getUrl().getAddress() + " use dubbo version " + Version.getVersion() + ", Please check registry access list (whitelist/blacklist)."); } + List> invokers = null; Map>> localMethodInvokerMap = this.methodInvokerMap; // local reference if (localMethodInvokerMap != null && localMethodInvokerMap.size() > 0) { From 1a3cffeacead7cff518d655c775c7da26492343f Mon Sep 17 00:00:00 2001 From: yuwei Date: Fri, 17 Jun 2016 12:19:32 +0800 Subject: [PATCH 2/5] tt --- .../alibaba/dubbo/registry/integration/RegistryDirectory.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java index 8a1c42db0829..104b54234cea 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java @@ -582,6 +582,7 @@ public List> doList(Invocation invocation) { throw new RpcException(RpcException.FORBIDDEN_EXCEPTION, "Forbid consumer " + NetUtils.getLocalHost() + " access service " + getInterface().getName() + " from registry " + getUrl().getAddress() + " use dubbo version " + Version.getVersion() + ", Please check registry access list (whitelist/blacklist)."); } + List> invokers = null; Map>> localMethodInvokerMap = this.methodInvokerMap; // local reference if (localMethodInvokerMap != null && localMethodInvokerMap.size() > 0) { From 3a38912a7afe241a35b67a309adf4aeb7be498a6 Mon Sep 17 00:00:00 2001 From: yuwei Date: Fri, 17 Jun 2016 12:54:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?mock=E5=8A=9F=E8=83=BD=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E4=BD=BF=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alibaba/dubbo/registry/integration/RegistryDirectory.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java index 104b54234cea..8a1c42db0829 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java @@ -582,7 +582,6 @@ public List> doList(Invocation invocation) { throw new RpcException(RpcException.FORBIDDEN_EXCEPTION, "Forbid consumer " + NetUtils.getLocalHost() + " access service " + getInterface().getName() + " from registry " + getUrl().getAddress() + " use dubbo version " + Version.getVersion() + ", Please check registry access list (whitelist/blacklist)."); } - List> invokers = null; Map>> localMethodInvokerMap = this.methodInvokerMap; // local reference if (localMethodInvokerMap != null && localMethodInvokerMap.size() > 0) { From 7b5a2170c0f485226f6b7904e3435c9087219548 Mon Sep 17 00:00:00 2001 From: yuwei Date: Fri, 23 Sep 2016 10:16:11 +0800 Subject: [PATCH 4/5] Merge remote-tracking branch 'upstream/master' # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. --- README.md | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8be6642a82d8..888c4848ef74 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Dubbox adds features like RESTful remoting, Kyro/FST serialization, etc to the p * Dylan 独立开发者 dinguangx@163.com * Kangfoo 独立开发者 -**讨论QQ群**：258792161 （不限于dubbox，包括SOA设计、互联网技术等等兴趣交流） +有技术问题请移步此处讨论 https://github.com/dangdangdotcom/dubbox/issues ## Dubbox当前的主要功能 @@ -199,4 +199,4 @@ http://stackoverflow.com/questions/17196766/can-resteasy-choose-method-based-on- ### JAX-RS中作POST的方法能够接收多个参数吗？ -http://stackoverflow.com/questions/5553218/jax-rs-post-multiple-objects \ No newline at end of file +http://stackoverflow.com/questions/5553218/jax-rs-post-multiple-objects diff --git a/pom.xml b/pom.xml index f4e69f74a4bf..2f1517bd3c93 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ 3.2.9.RELEASE - 3.15.0-GA + 3.20.0-GA 3.7.0.Final 1.1.7 2.1.4 From 91a8a325119d5ffd20255346fb8d448e034ca840 Mon Sep 17 00:00:00 2001 From: yuwei Date: Wed, 7 Jun 2017 18:14:17 +0800 Subject: [PATCH 5/5] ... --- .../alibaba/dubbo/registry/integration/RegistryDirectory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java index 8a1c42db0829..2c55e3513bdb 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java @@ -575,8 +575,8 @@ private void destroyUnusedInvokers(Map> oldUrlInvokerMap, Map } public List> doList(Invocation invocation) { - String attachment = invocation.getAttachment("invocation.need.mock"); - if (Boolean.TRUE.toString().equals(attachment)) { + String mockInvocation = invocation.getAttachment(Constants.INVOCATION_NEED_MOCK); + if (Boolean.TRUE.toString().equals(mockInvocation)) { logger.info("Don't throw RpcException when mock invocation occurs."); } else if (forbidden) { throw new RpcException(RpcException.FORBIDDEN_EXCEPTION, "Forbid consumer " + NetUtils.getLocalHost() + " access service " + getInterface().getName() + " from registry " + getUrl().getAddress() + " use dubbo version " + Version.getVersion() + ", Please check registry access list (whitelist/blacklist).");