Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
3f85a7db
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3f85a7db
编写于
5月 07, 2019
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Consistent exception naming across InvocableHandlerMethod variants
See gh-22900
上级
379d81da
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
19 deletion
+17
-19
spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java
.../messaging/handler/invocation/InvocableHandlerMethod.java
+5
-5
spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
...gframework/web/method/support/InvocableHandlerMethod.java
+5
-5
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
...rk/web/reactive/result/method/InvocableHandlerMethod.java
+7
-9
未找到文件。
spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java
浏览文件 @
3f85a7db
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -147,11 +147,11 @@ public class InvocableHandlerMethod extends HandlerMethod {
args
[
i
]
=
this
.
resolvers
.
resolveArgument
(
parameter
,
message
);
}
catch
(
Exception
ex
)
{
// Leave stack trace for later, exception may actually be resolved and handled..
// Leave stack trace for later, exception may actually be resolved and handled..
.
if
(
logger
.
isDebugEnabled
())
{
String
e
rror
=
ex
.
getMessage
();
if
(
e
rror
!=
null
&&
!
error
.
contains
(
parameter
.
getExecutable
().
toGenericString
()))
{
logger
.
debug
(
formatArgumentError
(
parameter
,
e
rror
));
String
e
xMsg
=
ex
.
getMessage
();
if
(
e
xMsg
!=
null
&&
!
exMsg
.
contains
(
parameter
.
getExecutable
().
toGenericString
()))
{
logger
.
debug
(
formatArgumentError
(
parameter
,
e
xMsg
));
}
}
throw
ex
;
...
...
spring-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
浏览文件 @
3f85a7db
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -166,11 +166,11 @@ public class InvocableHandlerMethod extends HandlerMethod {
args
[
i
]
=
this
.
resolvers
.
resolveArgument
(
parameter
,
mavContainer
,
request
,
this
.
dataBinderFactory
);
}
catch
(
Exception
ex
)
{
// Leave stack trace for later, exception may actually be resolved and handled..
// Leave stack trace for later, exception may actually be resolved and handled..
.
if
(
logger
.
isDebugEnabled
())
{
String
e
rror
=
ex
.
getMessage
();
if
(
e
rror
!=
null
&&
!
error
.
contains
(
parameter
.
getExecutable
().
toGenericString
()))
{
logger
.
debug
(
formatArgumentError
(
parameter
,
e
rror
));
String
e
xMsg
=
ex
.
getMessage
();
if
(
e
xMsg
!=
null
&&
!
exMsg
.
contains
(
parameter
.
getExecutable
().
toGenericString
()))
{
logger
.
debug
(
formatArgumentError
(
parameter
,
e
xMsg
));
}
}
throw
ex
;
...
...
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
浏览文件 @
3f85a7db
/*
* Copyright 2002-201
8
the original author or authors.
* Copyright 2002-201
9
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -190,7 +190,7 @@ public class InvocableHandlerMethod extends HandlerMethod {
try
{
argMonos
.
add
(
this
.
resolvers
.
resolveArgument
(
parameter
,
bindingContext
,
exchange
)
.
defaultIfEmpty
(
NO_ARG_VALUE
)
.
doOnError
(
cause
->
logArgumentErrorIfNecessary
(
exchange
,
parameter
,
cause
)));
.
doOnError
(
ex
->
logArgumentErrorIfNecessary
(
exchange
,
parameter
,
ex
)));
}
catch
(
Exception
ex
)
{
logArgumentErrorIfNecessary
(
exchange
,
parameter
,
ex
);
...
...
@@ -201,14 +201,12 @@ public class InvocableHandlerMethod extends HandlerMethod {
Stream
.
of
(
values
).
map
(
o
->
o
!=
NO_ARG_VALUE
?
o
:
null
).
toArray
());
}
private
void
logArgumentErrorIfNecessary
(
ServerWebExchange
exchange
,
MethodParameter
parameter
,
Throwable
cause
)
{
// Leave stack trace for later, if error is not handled..
String
message
=
cause
.
getMessage
();
if
(!
message
.
contains
(
parameter
.
getExecutable
().
toGenericString
()))
{
private
void
logArgumentErrorIfNecessary
(
ServerWebExchange
exchange
,
MethodParameter
parameter
,
Throwable
ex
)
{
// Leave stack trace for later, if error is not handled...
String
exMsg
=
ex
.
getMessage
();
if
(
exMsg
!=
null
&&
!
exMsg
.
contains
(
parameter
.
getExecutable
().
toGenericString
()))
{
if
(
logger
.
isDebugEnabled
())
{
logger
.
debug
(
exchange
.
getLogPrefix
()
+
formatArgumentError
(
parameter
,
message
));
logger
.
debug
(
exchange
.
getLogPrefix
()
+
formatArgumentError
(
parameter
,
exMsg
));
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录