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

Merge branch '3.0.x' into 3.1.x

Browse Source 
Closes gh-37920
This commit is contained in:
Andy Wilkinson
2023-10-18 10:07:01 +01:00
parent 94500f41e9 85c186a764
commit 60a0b7eedb
4 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartApplicationListener.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 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.
@@ -23,6 +23,7 @@ import org.springframework.boot.context.event.ApplicationFailedEvent;
import org.springframework.boot.context.event.ApplicationPreparedEvent;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.boot.context.event.ApplicationStartingEvent;
import org.springframework.boot.devtools.system.DevToolsEnablementDeducer;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.core.Ordered;
@@ -66,7 +67,14 @@ public class RestartApplicationListener implements ApplicationListener<Applicati
String enabled = System.getProperty(ENABLED_PROPERTY);
RestartInitializer restartInitializer = null;
if (enabled == null) {
restartInitializer = new DefaultRestartInitializer();
if (implicitlyEnableRestart()) {
restartInitializer = new DefaultRestartInitializer();
}
else {
logger.info("Restart disabled due to context in which it is running");
Restarter.disable();
return;
}
}
else if (Boolean.parseBoolean(enabled)) {
restartInitializer = new DefaultRestartInitializer() {
@@ -96,6 +104,10 @@ public class RestartApplicationListener implements ApplicationListener<Applicati
}
}
boolean implicitlyEnableRestart() {
return DevToolsEnablementDeducer.shouldEnable(Thread.currentThread());
}
private void onApplicationPreparedEvent(ApplicationPreparedEvent event) {
Restarter.getInstance().prepare(event.getApplicationContext());
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 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.
@@ -408,7 +408,7 @@ public class Restarter {
}
void prepare(ConfigurableApplicationContext applicationContext) {
if (applicationContext != null && applicationContext.getParent() != null) {
if (!this.enabled || (applicationContext != null && applicationContext.getParent() != null)) {
return;
}
if (applicationContext instanceof GenericApplicationContext genericContext) {