From e69c1defdf48bdb0e6832091d4647026105ad681 Mon Sep 17 00:00:00 2001 From: Michael Wiesenbauer <11874984+mwiesenbauer@users.noreply.github.com> Date: Wed, 22 May 2024 09:34:20 +0200 Subject: [PATCH] prevent npe during multipart exception handling (#1721) Signed-off-by: Michael Wiesenbauer Co-authored-by: Michael Wiesenbauer --- .../hawkbit/rest/exception/ResponseExceptionHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/ResponseExceptionHandler.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/ResponseExceptionHandler.java index 2131818a2..2102815bf 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/ResponseExceptionHandler.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/ResponseExceptionHandler.java @@ -27,6 +27,7 @@ import org.eclipse.hawkbit.rest.util.FileStreamingFailedException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; @@ -248,7 +249,7 @@ public class ResponseExceptionHandler { final List throwables = ExceptionUtils.getThrowableList(ex); final Throwable responseCause = throwables.get(throwables.size() - 1); - if (responseCause.getMessage().isEmpty()) { + if (ObjectUtils.isEmpty(responseCause.getMessage())) { log.warn("Request {} lead to MultipartException without root cause message:\n{}", request.getRequestURL(), ex.getStackTrace()); }