Merge branch '2.5.x' into 2.6.x

spring-projects · Jan 15, 2022 · 6afd9b6 · 6afd9b6
2 parents 28cf6f5 + bccc9c1
commit 6afd9b6
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/...java/org/springframework/boot/context/properties/source/ConfigurationPropertySources.java b/...java/org/springframework/boot/context/properties/source/ConfigurationPropertySources.java
@@ -87,15 +87,17 @@ public static void attach(Environment environment) {
 		Assert.isInstanceOf(ConfigurableEnvironment.class, environment);
 		MutablePropertySources sources = ((ConfigurableEnvironment) environment).getPropertySources();
 		PropertySource<?> attached = getAttached(sources);
-		if (attached != null) {
-			if (attached instanceof ConfigurationPropertySourcesPropertySource
-					&& ((SpringConfigurationPropertySources) attached.getSource()).isUsingSources(sources)) {
-				return;
-			}
-			sources.remove(ATTACHED_PROPERTY_SOURCE_NAME);
+		if (attached == null || !isUsingSources(attached, sources)) {
+			attached = new ConfigurationPropertySourcesPropertySource(ATTACHED_PROPERTY_SOURCE_NAME,
+					new SpringConfigurationPropertySources(sources));
 		}
-		sources.addFirst(new ConfigurationPropertySourcesPropertySource(ATTACHED_PROPERTY_SOURCE_NAME,
-				new SpringConfigurationPropertySources(sources)));
+		sources.remove(ATTACHED_PROPERTY_SOURCE_NAME);
+		sources.addFirst(attached);
+	}
+
+	private static boolean isUsingSources(PropertySource<?> attached, MutablePropertySources sources) {
+		return attached instanceof ConfigurationPropertySourcesPropertySource
+				&& ((SpringConfigurationPropertySources) attached.getSource()).isUsingSources(sources);
 	}
 
 	static PropertySource<?> getAttached(MutablePropertySources sources) {