spring-projects
diff --git a/‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java
Copy file name to clipboardExpand all lines: spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java
+4-2Lines changed: 4 additions & 2 deletions b/‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java
Copy file name to clipboardExpand all lines: spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySourceTests.java
Copy file name to clipboardExpand all lines: spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySourceTests.java
+15Lines changed: 15 additions & 0 deletions b/‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySourceTests.java
Copy file name to clipboardExpand all lines: spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySourceTests.java
+15Lines changed: 15 additions & 0 deletions
@@ -274,11 +274,13 @@ private void tryUpdate(EnumerablePropertySource<?> propertySource) {
 						if (configurationPropertyName != null && !configurationPropertyName.isEmpty()) {
 							add(mappings, configurationPropertyName, propertyName);
 							reverseMappings.put(propertyName, configurationPropertyName);
-							addParents(descendants, configurationPropertyName);
 						}
 					}
 				}
 			}
+			for (String propertyName : propertyNames) {
+				addParents(descendants, reverseMappings.get(propertyName));
+			}
 			ConfigurationPropertyName[] configurationPropertyNames = this.immutable
 					? reverseMappings.values().toArray(new ConfigurationPropertyName[0]) : null;
 			lastUpdated = this.immutable ? null : propertyNames;
@@ -296,7 +298,7 @@ private <K, V> Map<K, V> cloneOrCreate(Map<K, V> source, int size) {
 		}
 
 		private void addParents(Set<ConfigurationPropertyName> descendants, ConfigurationPropertyName name) {
-			if (descendants == null || name.isEmpty()) {
+			if (descendants == null || name == null || name.isEmpty()) {
 				return;
 			}
 			ConfigurationPropertyName parent = name.getParent();
 
@@ -239,6 +239,21 @@ void orderOfUnderlyingSourceIsPreserved() {
 				"test.map.bravo", "test.map.charlie", "test.map.delta");
 	}
 
+	@Test
+	void cacheRefreshRecalculatesDescendants() {
+		// gh-45639
+		Map<String, Object> map = new LinkedHashMap<>();
+		map.put("one.two.three", "test");
+		EnumerablePropertySource<?> source = new OriginTrackedMapPropertySource("test", map, false);
+		SpringIterableConfigurationPropertySource propertySource = new SpringIterableConfigurationPropertySource(source,
+				false, DefaultPropertyMapper.INSTANCE);
+		assertThat(propertySource.containsDescendantOf(ConfigurationPropertyName.of("one.two")))
+			.isEqualTo(ConfigurationPropertyState.PRESENT);
+		map.put("new", "value");
+		assertThat(propertySource.containsDescendantOf(ConfigurationPropertyName.of("one.two")))
+			.isEqualTo(ConfigurationPropertyState.PRESENT);
+	}
+
 	/**
 	 * Test {@link PropertySource} that's also an {@link OriginLookup}.
 	 *
Original file line number	Diff line number	Diff line change
`@@ -274,11 +274,13 @@ private void tryUpdate(EnumerablePropertySource<?> propertySource) {`
`274`	`274`	`if (configurationPropertyName != null && !configurationPropertyName.isEmpty()) {`
`275`	`275`	`add(mappings, configurationPropertyName, propertyName);`
`276`	`276`	`reverseMappings.put(propertyName, configurationPropertyName);`
`277`		`- addParents(descendants, configurationPropertyName);`
`278`	`277`	`}`
`279`	`278`	`}`
`280`	`279`	`}`
`281`	`280`	`}`
	`281`	`+ for (String propertyName : propertyNames) {`
	`282`	`+ addParents(descendants, reverseMappings.get(propertyName));`
	`283`	`+ }`
`282`	`284`	`ConfigurationPropertyName[] configurationPropertyNames = this.immutable`
`283`	`285`	`? reverseMappings.values().toArray(new ConfigurationPropertyName[0]) : null;`
`284`	`286`	`lastUpdated = this.immutable ? null : propertyNames;`
`@@ -296,7 +298,7 @@ private <K, V> Map<K, V> cloneOrCreate(Map<K, V> source, int size) {`
`296`	`298`	`}`
`297`	`299`
`298`	`300`	`private void addParents(Set<ConfigurationPropertyName> descendants, ConfigurationPropertyName name) {`
`299`		`- if (descendants == null \|\| name.isEmpty()) {`
	`301`	`+ if (descendants == null \|\| name == null \|\| name.isEmpty()) {`
`300`	`302`	`return;`
`301`	`303`	`}`
`302`	`304`	`ConfigurationPropertyName parent = name.getParent();`