|
1 | 1 | /*
|
2 |
| - * Copyright 2002-2018 the original author or authors. |
| 2 | + * Copyright 2002-2019 the original author or authors. |
3 | 3 | *
|
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License");
|
5 | 5 | * you may not use this file except in compliance with the License.
|
@@ -182,23 +182,23 @@ private Mono<Object[]> getMethodArgumentValues(Message<?> message, Object... pro
|
182 | 182 | try {
|
183 | 183 | argMonos.add(this.resolvers.resolveArgument(parameter, message)
|
184 | 184 | .defaultIfEmpty(NO_ARG_VALUE)
|
185 |
| - .doOnError(cause -> logArgumentErrorIfNecessary(parameter, cause))); |
| 185 | + .doOnError(ex -> logArgumentErrorIfNecessary(parameter, ex))); |
186 | 186 | }
|
187 | 187 | catch (Exception ex) {
|
188 | 188 | logArgumentErrorIfNecessary(parameter, ex);
|
189 | 189 | argMonos.add(Mono.error(ex));
|
190 | 190 | }
|
191 | 191 | }
|
192 | 192 | 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()); |
194 | 194 | }
|
195 | 195 |
|
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())) { |
200 | 200 | if (logger.isDebugEnabled()) {
|
201 |
| - logger.debug(formatArgumentError(parameter, causeMessage)); |
| 201 | + logger.debug(formatArgumentError(parameter, exMsg)); |
202 | 202 | }
|
203 | 203 | }
|
204 | 204 | }
|
|
0 commit comments