From a1c264f60fdd3375fdcb9b03785d2e39c95aeced Mon Sep 17 00:00:00 2001 From: Guillaume Alvarez Date: Fri, 10 Jun 2022 15:50:32 +0200 Subject: [PATCH] Support main port not being set when using SSL. When using HTTPS/SSL the 'port' may not be set from property `spring.cloud.zookeeper.discovery.instance-port`. In that case avoid throwing an exception and take the port at runtime. --- .../serviceregistry/ServiceInstanceRegistration.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ServiceInstanceRegistration.java b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ServiceInstanceRegistration.java index 5a54c0435..c8a839514 100644 --- a/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ServiceInstanceRegistration.java +++ b/spring-cloud-zookeeper-discovery/src/main/java/org/springframework/cloud/zookeeper/serviceregistry/ServiceInstanceRegistration.java @@ -84,7 +84,11 @@ public int getPort() { if (this.serviceInstance == null) { return 0; } - return this.serviceInstance.getPort(); + Integer port = this.serviceInstance.getPort(); + if (port == null) { // might be the case with SSL enabled + return 0; + } + return port.intValue(); } public void setPort(int port) {