Skip to content

Commit 30a1f6f

Browse files
committed
Consistent exception naming across InvocableHandlerMethod variants
See gh-22900
1 parent 4b06d8e commit 30a1f6f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHandlerMethod.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2002-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -182,23 +182,23 @@ private Mono<Object[]> getMethodArgumentValues(Message<?> message, Object... pro
182182
try {
183183
argMonos.add(this.resolvers.resolveArgument(parameter, message)
184184
.defaultIfEmpty(NO_ARG_VALUE)
185-
.doOnError(cause -> logArgumentErrorIfNecessary(parameter, cause)));
185+
.doOnError(ex -> logArgumentErrorIfNecessary(parameter, ex)));
186186
}
187187
catch (Exception ex) {
188188
logArgumentErrorIfNecessary(parameter, ex);
189189
argMonos.add(Mono.error(ex));
190190
}
191191
}
192192
return Mono.zip(argMonos, values ->
193-
Stream.of(values).map(o -> o != NO_ARG_VALUE ? o : null).toArray());
193+
Stream.of(values).map(value -> value != NO_ARG_VALUE ? value : null).toArray());
194194
}
195195

196-
private void logArgumentErrorIfNecessary(MethodParameter parameter, Throwable cause) {
197-
// Leave stack trace for later, if error is not handled..
198-
String causeMessage = cause.getMessage();
199-
if (!causeMessage.contains(parameter.getExecutable().toGenericString())) {
196+
private void logArgumentErrorIfNecessary(MethodParameter parameter, Throwable ex) {
197+
// Leave stack trace for later, if error is not handled...
198+
String exMsg = ex.getMessage();
199+
if (!exMsg.contains(parameter.getExecutable().toGenericString())) {
200200
if (logger.isDebugEnabled()) {
201-
logger.debug(formatArgumentError(parameter, causeMessage));
201+
logger.debug(formatArgumentError(parameter, exMsg));
202202
}
203203
}
204204
}

0 commit comments

Comments
 (0)