From 4f31b2c61be11f57ff6638ce1d72060e49adfee8 Mon Sep 17 00:00:00 2001 From: HupJ <576811031@qq.com> Date: Tue, 7 Jul 2020 09:43:46 +0800 Subject: [PATCH] Add explicit null checking for charset in SimpleHttpClient#encodeRequestParams (#1589) --- .../sentinel/transport/heartbeat/client/SimpleHttpClient.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sentinel-transport/sentinel-transport-simple-http/src/main/java/com/alibaba/csp/sentinel/transport/heartbeat/client/SimpleHttpClient.java b/sentinel-transport/sentinel-transport-simple-http/src/main/java/com/alibaba/csp/sentinel/transport/heartbeat/client/SimpleHttpClient.java index 6befd46f..5ec54e9f 100755 --- a/sentinel-transport/sentinel-transport-simple-http/src/main/java/com/alibaba/csp/sentinel/transport/heartbeat/client/SimpleHttpClient.java +++ b/sentinel-transport/sentinel-transport-simple-http/src/main/java/com/alibaba/csp/sentinel/transport/heartbeat/client/SimpleHttpClient.java @@ -156,6 +156,9 @@ public class SimpleHttpClient { * @return encoded request parameters, or empty string ("") if no parameters are provided */ private String encodeRequestParams(Map paramsMap, Charset charset) { + if (charset == null) { + throw new IllegalArgumentException("charset is not allowed to be null"); + } if (paramsMap == null || paramsMap.isEmpty()) { return ""; }