From 30ca2c0590c0129278e0abf2b0f5ef11d19556cb Mon Sep 17 00:00:00 2001
From: wpp <396859442@qq.com>
Date: Fri, 29 Jul 2022 13:29:07 +0800
Subject: [PATCH 1/2] Fix typos in Javadoc of class AbstractEncoder

AbstractEncoder is a Encoder implementations.
---
 .../java/org/springframework/core/codec/AbstractEncoder.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java
index 5a2633d7737f..ac6fe31fdbd6 100644
--- a/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java
+++ b/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java
@@ -27,7 +27,7 @@
 import org.springframework.util.MimeType;
 
 /**
- * Abstract base class for {@link Decoder} implementations.
+ * Abstract base class for {@link Encoder} implementations.
  *
  * @author Sebastien Deleuze
  * @author Arjen Poutsma

From 382275a94fabae538a4ce5faa761a48aa531f4e1 Mon Sep 17 00:00:00 2001
From: edfeff <396859442@qq.com>
Date: Thu, 6 Apr 2023 18:28:26 +0800
Subject: [PATCH 2/2] Fix DisposableBeanAdapter throws NPE

#issues-10879
---
 .../beans/factory/support/DisposableBeanAdapter.java          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
index 4b02c869cdd0..fd5459b80e95 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
@@ -236,7 +236,9 @@ public void destroy() {
 		}
 		else if (this.destroyMethods != null) {
 			for (Method destroyMethod : this.destroyMethods) {
-				invokeCustomDestroyMethod(destroyMethod);
+				if (destroyMethod != null) {
+					invokeCustomDestroyMethod(destroyMethod);
+				}
 			}
 		}
 		else if (this.destroyMethodNames != null) {