From 3b6220dd484a1ae967ed6592b89f5d2912a352d3 Mon Sep 17 00:00:00 2001
From: fangjian0423 <fangjian0423@gmail.com>
Date: Sun, 29 Sep 2019 16:36:02 +0800
Subject: [PATCH] do some optimizations about GenericService

---
 .../repository/DubboServiceMetadataRepository.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java
index b8e3219a..7a78e445 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java
+++ b/spring-cloud-alibaba-dubbo/src/main/java/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java
@@ -289,9 +289,7 @@ public class DubboServiceMetadataRepository
 							serviceName);
 				}
 
-				// Keep the order in following invocations
 				initSubscribedDubboMetadataService(serviceName);
-				initDubboRestServiceMetadataRepository(serviceName);
 				// mark this service name having been initialized
 				initializedServices.add(serviceName);
 			}
@@ -392,9 +390,11 @@ public class DubboServiceMetadataRepository
 			return emptyList();
 		}
 
-		return hasText(protocol) ? urls.stream()
-				.filter(url -> url.getProtocol().equalsIgnoreCase(protocol))
-				.collect(Collectors.toList()) : unmodifiableList(urls);
+		return hasText(protocol)
+				? urls.stream()
+						.filter(url -> url.getProtocol().equalsIgnoreCase(protocol))
+						.collect(Collectors.toList())
+				: unmodifiableList(urls);
 	}
 
 	/**
@@ -630,6 +630,7 @@ public class DubboServiceMetadataRepository
 						}
 					});
 				});
+		initDubboRestServiceMetadataRepository(serviceName);
 	}
 
 	private void initSubscribedDubboMetadataServiceURL(URL dubboMetadataServiceURL) {