root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Use Threadlocal.remove instead of .set(null) 

See https://github.com/spring-cloud/spring-cloud-sleuth/issues/27 for
reference.
This commit is contained in:
Moritz Halbritter 2023-01-11 11:38:48 +01:00
parent 887c00e9fc
commit e45b47565c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@ -1386,7 +1386,7 @@ public class SpringApplication {
return action.get(); return action.get();
} }
finally { finally {
applicationHook.set(null); applicationHook.remove();
} }
} }

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CharSequenceToObjectConverter.java
View File

@ -68,7 +68,7 @@ class CharSequenceToObjectConverter implements ConditionalGenericConverter {
return this.conversionService.canConvert(STRING, targetType); return this.conversionService.canConvert(STRING, targetType);
} }
finally { finally {
this.disable.set(null); this.disable.remove();
} }
} }