Merge pull request #40963 from quaff

mhalbritter · mhalbritter · commit 8a7d670ff1b3 · 2024-06-04T09:06:39.000+02:00
* pr/40963: Remove unnecessary null check Closes gh-40963
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySources.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySources.java
@@ -87,7 +87,7 @@ public static void attach(Environment environment) {
 		Assert.isInstanceOf(ConfigurableEnvironment.class, environment);
 		MutablePropertySources sources = ((ConfigurableEnvironment) environment).getPropertySources();
 		PropertySource<?> attached = getAttached(sources);
-		if (attached == null || !isUsingSources(attached, sources)) {
+		if (!isUsingSources(attached, sources)) {
 			attached = new ConfigurationPropertySourcesPropertySource(ATTACHED_PROPERTY_SOURCE_NAME,
 					new SpringConfigurationPropertySources(sources));
 		}

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public static void attach(Environment environment) {`
`87`	`87`	`Assert.isInstanceOf(ConfigurableEnvironment.class, environment);`
`88`	`88`	`MutablePropertySources sources = ((ConfigurableEnvironment) environment).getPropertySources();`
`89`	`89`	`PropertySource<?> attached = getAttached(sources);`
`90`		`- if (attached == null \|\| !isUsingSources(attached, sources)) {`
	`90`	`+ if (!isUsingSources(attached, sources)) {`
`91`	`91`	`attached = new ConfigurationPropertySourcesPropertySource(ATTACHED_PROPERTY_SOURCE_NAME,`
`92`	`92`	`new SpringConfigurationPropertySources(sources));`
`93`	`93`	`}`