Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
2dd11343
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,发现更多精彩内容 >>
提交
2dd11343
编写于
3月 09, 2010
作者:
A
Andy Clement
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SPR-6941: part (1) correct exception handling when null cachedExecutor
上级
0efb9d80
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
11 deletion
+49
-11
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
.../springframework/expression/spel/ast/MethodReference.java
+22
-11
org.springframework.expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
...pringframework/expression/spel/MethodInvocationTests.java
+27
-0
未找到文件。
org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
浏览文件 @
2dd11343
...
@@ -89,17 +89,7 @@ public class MethodReference extends SpelNodeImpl {
...
@@ -89,17 +89,7 @@ public class MethodReference extends SpelNodeImpl {
// may or may not be a root cause. If there is a root cause it is a user created exception.
// may or may not be a root cause. If there is a root cause it is a user created exception.
// If there is no root cause it was a reflective invocation problem.
// If there is no root cause it was a reflective invocation problem.
Throwable
causeOfAccessException
=
ae
.
getCause
();
throwSimpleExceptionIfPossible
(
state
,
ae
);
Throwable
rootCause
=
(
causeOfAccessException
==
null
?
null
:
causeOfAccessException
.
getCause
());
if
(
rootCause
!=
null
)
{
// User exception was the root cause - exit now
if
(
rootCause
instanceof
RuntimeException
)
{
throw
(
RuntimeException
)
rootCause
;
}
else
{
throw
new
SpelEvaluationException
(
getStartPosition
(),
rootCause
,
SpelMessage
.
EXCEPTION_DURING_METHOD_INVOCATION
,
this
.
name
,
state
.
getActiveContextObject
().
getValue
().
getClass
().
getName
(),
rootCause
.
getMessage
());
}
}
// at this point we know it wasn't a user problem so worth a retry if a better candidate can be found
// at this point we know it wasn't a user problem so worth a retry if a better candidate can be found
this
.
cachedExecutor
=
null
;
this
.
cachedExecutor
=
null
;
...
@@ -113,11 +103,32 @@ public class MethodReference extends SpelNodeImpl {
...
@@ -113,11 +103,32 @@ public class MethodReference extends SpelNodeImpl {
return
executorToUse
.
execute
(
return
executorToUse
.
execute
(
state
.
getEvaluationContext
(),
state
.
getActiveContextObject
().
getValue
(),
arguments
);
state
.
getEvaluationContext
(),
state
.
getActiveContextObject
().
getValue
(),
arguments
);
}
catch
(
AccessException
ae
)
{
}
catch
(
AccessException
ae
)
{
// Same unwrapping exception handling as above in above catch block
throwSimpleExceptionIfPossible
(
state
,
ae
);
throw
new
SpelEvaluationException
(
getStartPosition
(),
ae
,
SpelMessage
.
EXCEPTION_DURING_METHOD_INVOCATION
,
throw
new
SpelEvaluationException
(
getStartPosition
(),
ae
,
SpelMessage
.
EXCEPTION_DURING_METHOD_INVOCATION
,
this
.
name
,
state
.
getActiveContextObject
().
getValue
().
getClass
().
getName
(),
ae
.
getMessage
());
this
.
name
,
state
.
getActiveContextObject
().
getValue
().
getClass
().
getName
(),
ae
.
getMessage
());
}
}
}
}
/**
* Decode the AccessException, throwing a lightweight evaluation exception or, if the cause was a RuntimeException,
* throw the RuntimeException directly.
*/
private
void
throwSimpleExceptionIfPossible
(
ExpressionState
state
,
AccessException
ae
)
{
Throwable
causeOfAccessException
=
ae
.
getCause
();
Throwable
rootCause
=
(
causeOfAccessException
==
null
?
null
:
causeOfAccessException
.
getCause
());
if
(
rootCause
!=
null
)
{
// User exception was the root cause - exit now
if
(
rootCause
instanceof
RuntimeException
)
{
throw
(
RuntimeException
)
rootCause
;
}
else
{
throw
new
SpelEvaluationException
(
getStartPosition
(),
rootCause
,
SpelMessage
.
EXCEPTION_DURING_METHOD_INVOCATION
,
this
.
name
,
state
.
getActiveContextObject
().
getValue
().
getClass
().
getName
(),
rootCause
.
getMessage
());
}
}
}
private
Class
<?>[]
getTypes
(
Object
...
arguments
)
{
private
Class
<?>[]
getTypes
(
Object
...
arguments
)
{
Class
<?>[]
argumentTypes
=
new
Class
[
arguments
.
length
];
Class
<?>[]
argumentTypes
=
new
Class
[
arguments
.
length
];
for
(
int
i
=
0
;
i
<
arguments
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
arguments
.
length
;
i
++)
{
...
...
org.springframework.expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java
浏览文件 @
2dd11343
...
@@ -156,6 +156,33 @@ public class MethodInvocationTests extends ExpressionTestCase {
...
@@ -156,6 +156,33 @@ public class MethodInvocationTests extends ExpressionTestCase {
Assert
.
assertEquals
(
4
,
parser
.
parseExpression
(
"counter"
).
getValue
(
eContext
));
Assert
.
assertEquals
(
4
,
parser
.
parseExpression
(
"counter"
).
getValue
(
eContext
));
}
}
/**
* Check on first usage (when the cachedExecutor in MethodReference is null) that the exception is not wrapped.
*/
@Test
public
void
testMethodThrowingException_SPR6941
()
{
// Test method on inventor: throwException()
// On 1 it will throw an IllegalArgumentException
// On 2 it will throw a RuntimeException
// On 3 it will exit normally
// In each case it increments the Inventor field 'counter' when invoked
SpelExpressionParser
parser
=
new
SpelExpressionParser
();
Expression
expr
=
parser
.
parseExpression
(
"throwException(#bar)"
);
eContext
.
setVariable
(
"bar"
,
2
);
try
{
expr
.
getValue
(
eContext
);
Assert
.
fail
();
}
catch
(
Exception
e
)
{
if
(
e
instanceof
SpelEvaluationException
)
{
e
.
printStackTrace
();
Assert
.
fail
(
"Should not be a SpelEvaluationException"
);
}
// normal
}
}
@Test
@Test
public
void
testMethodFiltering_SPR6764
()
{
public
void
testMethodFiltering_SPR6764
()
{
SpelExpressionParser
parser
=
new
SpelExpressionParser
();
SpelExpressionParser
parser
=
new
SpelExpressionParser
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录