[shenyu] branch master updated: fix issue: correctly parse dubbo.protocol.port=-1 (#4024)

[xiaoyu]

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

xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new 34b775fd0 fix issue: correctly parse dubbo.protocol.port=-1 (#4024)
34b775fd0 is described below

commit 34b775fd0e8a8bdd6ae04e1d63c47096154d02df
Author: pandaapo <35672972+panda...@users.noreply.github.com>
AuthorDate: Fri Sep 30 10:37:16 2022 +0800

    fix issue: correctly parse dubbo.protocol.port=-1 (#4024)
---
 .../shenyu/client/alibaba/dubbo/AlibabaDubboServiceBeanListener.java    | 2 +-
 .../shenyu/client/apache/dubbo/ApacheDubboServiceBeanListener.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/main/java/org/apache/shenyu/client/alibaba/dubbo/AlibabaDubboServiceBeanListener.java
 
b/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/main/java/org/apache/shenyu/client/alibaba/dubbo/AlibabaDubboServiceBeanListener.java
index fb6db993c..95aa3c4b4 100644
--- 
a/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/main/java/org/apache/shenyu/client/alibaba/dubbo/AlibabaDubboServiceBeanListener.java
+++ 
b/shenyu-client/shenyu-client-dubbo/shenyu-client-alibaba-dubbo/src/main/java/org/apache/shenyu/client/alibaba/dubbo/AlibabaDubboServiceBeanListener.java
@@ -102,7 +102,7 @@ public class AlibabaDubboServiceBeanListener extends 
AbstractContextRefreshedEve
 
     private int buildPort(final ServiceBean<?> serviceBean) {
         final String port = this.getPort();
-        return StringUtils.isBlank(port) ? serviceBean.getProtocol().getPort() 
: Integer.parseInt(port);
+        return StringUtils.isBlank(port) || "-1".equals(port) ? 
serviceBean.getProtocol().getPort() : Integer.parseInt(port);
     }
 
     @Override
diff --git 
a/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/main/java/org/apache/shenyu/client/apache/dubbo/ApacheDubboServiceBeanListener.java
 
b/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/main/java/org/apache/shenyu/client/apache/dubbo/ApacheDubboServiceBeanListener.java
index e7d3a84c6..e5879dcff 100644
--- 
a/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/main/java/org/apache/shenyu/client/apache/dubbo/ApacheDubboServiceBeanListener.java
+++ 
b/shenyu-client/shenyu-client-dubbo/shenyu-client-apache-dubbo/src/main/java/org/apache/shenyu/client/apache/dubbo/ApacheDubboServiceBeanListener.java
@@ -105,7 +105,7 @@ public class ApacheDubboServiceBeanListener extends 
AbstractContextRefreshedEven
     
     private int buildPort(final ServiceBean<?> serviceBean) {
         final String port = this.getPort();
-        return StringUtils.isBlank(port) ? serviceBean.getProtocol().getPort() 
: Integer.parseInt(port);
+        return StringUtils.isBlank(port) || "-1".equals(port) ? 
serviceBean.getProtocol().getPort() : Integer.parseInt(port);
     }
     
     @Override