From 2a0755c279f3924d83eec25f591ff6347a1c3f51 Mon Sep 17 00:00:00 2001 From: Ken Liu Date: Tue, 26 Dec 2023 19:49:01 +0800 Subject: [PATCH] Check if protocol already found before going through ConsumerConfig. (#13510) * Check if protocol already found before going through ConsumerConfig. * fix spotless issue --- .../InternalServiceConfigBuilder.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/InternalServiceConfigBuilder.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/InternalServiceConfigBuilder.java index 9320382d44..e53490979d 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/InternalServiceConfigBuilder.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/builders/InternalServiceConfigBuilder.java @@ -163,16 +163,18 @@ public class InternalServiceConfigBuilder { } } // - protocol = moduleModels.stream() - .map(ModuleModel::getConfigManager) - .map(ModuleConfigManager::getConsumers) - .filter(CollectionUtils::isNotEmpty) - .flatMap(Collection::stream) - .map(ConsumerConfig::getProtocol) - .filter(StringUtils::isNotEmpty) - .filter(p -> ACCEPTABLE_PROTOCOL.contains(p)) - .findFirst() - .orElse(""); + if (StringUtils.isEmpty(protocol)) { + protocol = moduleModels.stream() + .map(ModuleModel::getConfigManager) + .map(ModuleConfigManager::getConsumers) + .filter(CollectionUtils::isNotEmpty) + .flatMap(Collection::stream) + .map(ConsumerConfig::getProtocol) + .filter(StringUtils::isNotEmpty) + .filter(p -> ACCEPTABLE_PROTOCOL.contains(p)) + .findFirst() + .orElse(""); + } return StringUtils.isNotEmpty(protocol) && ACCEPTABLE_PROTOCOL.contains(protocol) ? protocol : DUBBO_PROTOCOL; }