Merge branch '2.5.x' into 2.6.x

spring-projects · Feb 24, 2022 · 9411fc2 · 9411fc2
2 parents 59ffe28 + 57009d5
commit 9411fc2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/...ure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/...ure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 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.

diff --git a/...ect/spring-boot/src/main/java/org/springframework/boot/SpringApplicationShutdownHook.java b/...ect/spring-boot/src/main/java/org/springframework/boot/SpringApplicationShutdownHook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 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.
@@ -95,12 +95,8 @@ void addRuntimeShutdownHook() {
 
 	void deregisterFailedApplicationContext(ConfigurableApplicationContext applicationContext) {
 		synchronized (SpringApplicationShutdownHook.class) {
-			if (!applicationContext.isActive()) {
-				SpringApplicationShutdownHook.this.contexts.remove(applicationContext);
-			}
-			else {
-				throw new IllegalStateException("Cannot unregister active application context");
-			}
+			Assert.state(!applicationContext.isActive(), "Cannot unregister active application context");
+			SpringApplicationShutdownHook.this.contexts.remove(applicationContext);
 		}
 	}
 

diff --git a/...ing-boot/src/main/java/org/springframework/boot/context/properties/bind/DefaultValue.java b/...ing-boot/src/main/java/org/springframework/boot/context/properties/bind/DefaultValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 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.