Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source 
Closes gh-31178
This commit is contained in:
Andy Wilkinson
2022-05-26 15:54:58 +01:00
parent e9673fd622 455ee0ce22
commit 5dfa5adb75
68 changed files with 137 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public class OptionalLiveReloadServer implements InitializingBean {
startServer();
}
void startServer() throws Exception {
void startServer() {
if (this.server != null) {
try {
if (!this.server.isStarted()) {

10
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
View File

@@ -320,12 +320,12 @@ public class Restarter {
System.runFinalization();
}
private void cleanupCaches() throws Exception {
private void cleanupCaches() {
Introspector.flushCaches();
cleanupKnownCaches();
}
private void cleanupKnownCaches() throws Exception {
private void cleanupKnownCaches() {
// Whilst not strictly necessary it helps to cleanup soft reference caches
// early rather than waiting for memory limits to be reached
ResolvableType.clearCache();
@@ -334,13 +334,13 @@ public class Restarter {
clearAnnotationUtilsCache();
}
private void cleanCachedIntrospectionResultsCache() throws Exception {
private void cleanCachedIntrospectionResultsCache() {
clear(CachedIntrospectionResults.class, "acceptedClassLoaders");
clear(CachedIntrospectionResults.class, "strongClassCache");
clear(CachedIntrospectionResults.class, "softClassCache");
}
private void clearAnnotationUtilsCache() throws Exception {
private void clearAnnotationUtilsCache() {
try {
AnnotationUtils.clearCache();
}
@@ -350,7 +350,7 @@ public class Restarter {
}
}
private void clear(Class<?> type, String fieldName) throws Exception {
private void clear(Class<?> type, String fieldName) {
try {
Field field = type.getDeclaredField(fieldName);
field.setAccessible(true);