This is an automated email from the ASF dual-hosted git repository. kylixs pushed a commit to branch 3.0-multi-instances in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 7e1f2361262f199c79a4dcb21c8797fcbd914608 Author: gongdewei <[email protected]> AuthorDate: Tue Aug 31 15:33:19 2021 +0800 Fix consumer url NPE --- .../java/org/apache/dubbo/registry/client/InstanceAddressURL.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/InstanceAddressURL.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/InstanceAddressURL.java index 506dcd2..fb41ba7 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/InstanceAddressURL.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/InstanceAddressURL.java @@ -22,6 +22,7 @@ import org.apache.dubbo.common.url.component.URLParam; import org.apache.dubbo.common.utils.StringUtils; import org.apache.dubbo.metadata.MetadataInfo; import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.model.ApplicationModel; import org.apache.dubbo.rpc.model.ScopeModel; import org.apache.dubbo.rpc.model.ServiceModel; @@ -395,12 +396,14 @@ public class InstanceAddressURL extends URL { @Override public ScopeModel getScopeModel() { - return RpcContext.getServiceContext().getConsumerUrl().getScopeModel(); + URL consumerUrl = RpcContext.getServiceContext().getConsumerUrl(); + return consumerUrl != null ? consumerUrl.getScopeModel() : ApplicationModel.defaultModel().getDefaultModule(); } @Override public ServiceModel getServiceModel() { - return RpcContext.getServiceContext().getConsumerUrl().getServiceModel(); + URL consumerUrl = RpcContext.getServiceContext().getConsumerUrl(); + return consumerUrl != null ? consumerUrl.getServiceModel() : null; } @Override
