Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sesemomo
spring-framework
提交
82fa4ef2
S
spring-framework
项目概览
sesemomo
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
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,发现更多精彩内容 >>
提交
82fa4ef2
编写于
11月 02, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
Issue: SPR-14863
上级
388e173b
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
1193 addition
and
1151 deletion
+1193
-1151
spring-expression/src/main/java/org/springframework/expression/spel/ast/OpEQ.java
...in/java/org/springframework/expression/spel/ast/OpEQ.java
+5
-7
spring-expression/src/main/java/org/springframework/expression/spel/ast/OpNE.java
...in/java/org/springframework/expression/spel/ast/OpNE.java
+5
-7
spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
...ava/org/springframework/expression/spel/ast/Operator.java
+10
-0
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
...amework/expression/spel/SpelCompilationCoverageTests.java
+1173
-1137
未找到文件。
spring-expression/src/main/java/org/springframework/expression/spel/ast/OpEQ.java
浏览文件 @
82fa4ef2
...
...
@@ -36,9 +36,9 @@ public class OpEQ extends Operator {
this
.
exitTypeDescriptor
=
"Z"
;
}
@Override
public
BooleanTypedValue
getValueInternal
(
ExpressionState
state
)
throws
EvaluationException
{
public
BooleanTypedValue
getValueInternal
(
ExpressionState
state
)
throws
EvaluationException
{
Object
left
=
getLeftOperand
().
getValueInternal
(
state
).
getValue
();
Object
right
=
getRightOperand
().
getValueInternal
(
state
).
getValue
();
this
.
leftActualDescriptor
=
CodeFlow
.
toDescriptorFromObject
(
left
);
...
...
@@ -86,11 +86,9 @@ public class OpEQ extends Operator {
}
String
operatorClassName
=
Operator
.
class
.
getName
().
replace
(
'.'
,
'/'
);
String
evaluationContextClassName
=
EvaluationContext
.
class
.
getName
().
replace
(
'.'
,
'/'
);
mv
.
visitMethodInsn
(
INVOKESTATIC
,
operatorClassName
,
"equalityCheck"
,
"(L"
+
evaluationContextClassName
+
";Ljava/lang/Object;Ljava/lang/Object;)Z"
,
false
);
String
evaluationContextClassName
=
EvaluationContext
.
class
.
getName
().
replace
(
'.'
,
'/'
);
mv
.
visitMethodInsn
(
INVOKESTATIC
,
operatorClassName
,
"equalityCheck"
,
"(L"
+
evaluationContextClassName
+
";Ljava/lang/Object;Ljava/lang/Object;)Z"
,
false
);
cf
.
pushDescriptor
(
"Z"
);
}
...
...
spring-expression/src/main/java/org/springframework/expression/spel/ast/OpNE.java
浏览文件 @
82fa4ef2
...
...
@@ -37,9 +37,9 @@ public class OpNE extends Operator {
this
.
exitTypeDescriptor
=
"Z"
;
}
@Override
public
BooleanTypedValue
getValueInternal
(
ExpressionState
state
)
throws
EvaluationException
{
public
BooleanTypedValue
getValueInternal
(
ExpressionState
state
)
throws
EvaluationException
{
Object
left
=
getLeftOperand
().
getValueInternal
(
state
).
getValue
();
Object
right
=
getRightOperand
().
getValueInternal
(
state
).
getValue
();
this
.
leftActualDescriptor
=
CodeFlow
.
toDescriptorFromObject
(
left
);
...
...
@@ -87,11 +87,9 @@ public class OpNE extends Operator {
}
String
operatorClassName
=
Operator
.
class
.
getName
().
replace
(
'.'
,
'/'
);
String
evaluationContextClassName
=
EvaluationContext
.
class
.
getName
().
replace
(
'.'
,
'/'
);
mv
.
visitMethodInsn
(
INVOKESTATIC
,
operatorClassName
,
"equalityCheck"
,
"(L"
+
evaluationContextClassName
+
";Ljava/lang/Object;Ljava/lang/Object;)Z"
,
false
);
String
evaluationContextClassName
=
EvaluationContext
.
class
.
getName
().
replace
(
'.'
,
'/'
);
mv
.
visitMethodInsn
(
INVOKESTATIC
,
operatorClassName
,
"equalityCheck"
,
"(L"
+
evaluationContextClassName
+
";Ljava/lang/Object;Ljava/lang/Object;)Z"
,
false
);
// Invert the boolean
Label
notZero
=
new
Label
();
...
...
spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java
浏览文件 @
82fa4ef2
...
...
@@ -159,6 +159,16 @@ public abstract class Operator extends SpelNodeImpl {
cf
.
pushDescriptor
(
"Z"
);
}
/**
* Perform an equality check for the given operand values.
* <p>This method is not just used for reflective comparisons in subclasses
* but also from compiled expression code, which is why it needs to be
* declared as {@code public static} here.
* @param context the current evaluation context
* @param left the left-hand operand value
* @param right the right-hand operand value
*/
public
static
boolean
equalityCheck
(
EvaluationContext
context
,
Object
left
,
Object
right
)
{
if
(
left
instanceof
Number
&&
right
instanceof
Number
)
{
Number
leftNumber
=
(
Number
)
left
;
...
...
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
浏览文件 @
82fa4ef2
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录