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

Polishing (aligned with main)

This commit is contained in:
Juergen Hoeller 2024-06-11 09:07:09 +02:00
parent eca2b9657e
commit fce2f49e46
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java
View File

@ -250,13 +250,13 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
lifecycleBeans.forEach((beanName, bean) -> { lifecycleBeans.forEach((beanName, bean) -> {
if (!autoStartupOnly || isAutoStartupCandidate(beanName, bean)) { if (!autoStartupOnly || isAutoStartupCandidate(beanName, bean)) {
int phase = getPhase(bean); int startupPhase = getPhase(bean);
phases.computeIfAbsent( phases.computeIfAbsent(startupPhase,
phase, phase -> new LifecycleGroup(phase, this.timeoutPerShutdownPhase, lifecycleBeans, autoStartupOnly)
p -> new LifecycleGroup(phase, this.timeoutPerShutdownPhase, lifecycleBeans, autoStartupOnly)
).add(beanName, bean); ).add(beanName, bean);
} }
}); });
if (!phases.isEmpty()) { if (!phases.isEmpty()) {
phases.values().forEach(LifecycleGroup::start); phases.values().forEach(LifecycleGroup::start);
} }
@ -307,13 +307,14 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor
private void stopBeans() { private void stopBeans() {
Map<String, Lifecycle> lifecycleBeans = getLifecycleBeans(); Map<String, Lifecycle> lifecycleBeans = getLifecycleBeans();
Map<Integer, LifecycleGroup> phases = new TreeMap<>(Comparator.reverseOrder()); Map<Integer, LifecycleGroup> phases = new TreeMap<>(Comparator.reverseOrder());
lifecycleBeans.forEach((beanName, bean) -> { lifecycleBeans.forEach((beanName, bean) -> {
int shutdownPhase = getPhase(bean); int shutdownPhase = getPhase(bean);
phases.computeIfAbsent( phases.computeIfAbsent(shutdownPhase,
shutdownPhase, phase -> new LifecycleGroup(phase, this.timeoutPerShutdownPhase, lifecycleBeans, false)
p -> new LifecycleGroup(shutdownPhase, this.timeoutPerShutdownPhase, lifecycleBeans, false)
).add(beanName, bean); ).add(beanName, bean);
}); });
if (!phases.isEmpty()) { if (!phases.isEmpty()) {
phases.values().forEach(LifecycleGroup::stop); phases.values().forEach(LifecycleGroup::stop);
} }