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

Ignore nonexistent default-destroy-method in XML config 

Prior to this commit, DisposableBeanAdapter attempted to invoke a
configured default-destroy-method on every bean, including beans that
do not declare the named destroy method, resulting in a
NullPointerException being thrown and logged at WARN level.

This commit addresses this by effectively ignoring any nonexistent
destroy method.

Closes gh-30301
This commit is contained in:
Sam Brannen 2023-04-07 13:58:49 +02:00
parent b5b115e52c
commit c811428512
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
View File

@ -236,9 +236,11 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
} }
else if (this.destroyMethods != null) { else if (this.destroyMethods != null) {
for (Method destroyMethod : this.destroyMethods) { for (Method destroyMethod : this.destroyMethods) {
if (destroyMethod != null) {
invokeCustomDestroyMethod(destroyMethod); invokeCustomDestroyMethod(destroyMethod);
} }
} }
}
else if (this.destroyMethodNames != null) { else if (this.destroyMethodNames != null) {
for (String destroyMethodName: this.destroyMethodNames) { for (String destroyMethodName: this.destroyMethodNames) {
Method destroyMethod = determineDestroyMethod(destroyMethodName); Method destroyMethod = determineDestroyMethod(destroyMethodName);