fix NPE in NativeEnvironmentRepository (#1809)

bozonp · web-flow · commit fee69f872b23 · 2021-02-26T08:41:56.000-05:00
Since the fix of this issue : #1771, I experience a NullpointerException at the launch of my service. Indeed, the "location" var is null in my case. Note : since the new Config file processing in Spring Boot 2.4, I'm using the Legacy Processing (spring.config.use-legacy-processing: true), migrating in the new process is way too breaking for my project.
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java
@@ -259,7 +259,7 @@ protected Environment clean(Environment value) {
 						matches = true;
 						break;
 					}
-					if (location.startsWith("file:")) {
+					if (location != null && location.startsWith("file:")) {
 						location = StringUtils
 								.cleanPath(new File(location.substring("file:".length())).getAbsolutePath()) + "/";
 					}

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ protected Environment clean(Environment value) {`
`259`	`259`	`matches = true;`
`260`	`260`	`break;`
`261`	`261`	`}`
`262`		`- if (location.startsWith("file:")) {`
	`262`	`+ if (location != null && location.startsWith("file:")) {`
`263`	`263`	`location = StringUtils`
`264`	`264`	`.cleanPath(new File(location.substring("file:".length())).getAbsolutePath()) + "/";`
`265`	`265`	`}`