diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2286527c..17a1d8fa1 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,7 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 6.0.0-M17 (2024-10-09)
-
-### 计划实现
-* 【db     】     增加DDL封装
-* 【db     】     Entity数据量大时占用较多内存，考虑共享meta信息
+# 6.0.0-M22 (2025-05-07)
 
 ### ❌不兼容特性
 
diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Response.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Response.java
index e3ca99e4d..0eead2108 100644
--- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Response.java
+++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/httpclient5/HttpClient5Response.java
@@ -96,7 +96,7 @@ public class HttpClient5Response extends SimpleWrapper<ClassicHttpResponse> impl
 
 	@Override
 	public long contentLength() {
-		return this.entity.getContentLength();
+		return null == this.entity ? -1 : this.entity.getContentLength();
 	}
 
 	@Override
@@ -106,6 +106,9 @@ public class HttpClient5Response extends SimpleWrapper<ClassicHttpResponse> impl
 
 	@Override
 	public InputStream bodyStream() {
+		if(null == this.entity){
+			return null;
+		}
 		try {
 			return this.entity.getContent();
 		} catch (final IOException e) {
@@ -130,6 +133,9 @@ public class HttpClient5Response extends SimpleWrapper<ClassicHttpResponse> impl
 
 	@Override
 	public String bodyStr() throws HttpException {
+		if(null == this.entity){
+			return null;
+		}
 		try {
 			return EntityUtils.toString(this.entity, charset());
 		} catch (final IOException e) {