Fix NPE in RepeatTemplate

Resolves #1123
spring-projects · Nov 20, 2023 · 03d2833 · 03d2833
1 parent dcd1ac8
commit 03d2833
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/...infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java b/...infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java
@@ -286,8 +286,15 @@ private void doHandle(Throwable throwable, RepeatContext context, Collection<Thr
 			}
 
 			if (logger.isDebugEnabled()) {
-				logger.debug("Handling exception: " + throwable.getClass().getName() + ", caused by: "
-						+ unwrappedThrowable.getClass().getName() + ": " + unwrappedThrowable.getMessage());
+				StringBuilder message = new StringBuilder("Handling exception: ")
+					.append(throwable.getClass().getName());
+				if (unwrappedThrowable != null) {
+					message.append(", caused by: ")
+						.append(unwrappedThrowable.getClass().getName())
+						.append(": ")
+						.append(unwrappedThrowable.getMessage());
+				}
+				logger.debug(message.toString());
 			}
 			exceptionHandler.handleException(context, unwrappedThrowable);