Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
64f2beb9
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 搜索 >>
提交
64f2beb9
编写于
10月 29, 2019
作者:
D
Dekel Pilli
提交者:
Rossen Stoyanchev
10月 31, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixing NPE in AbstractNamedValueMethodArgumentResolver
See gh-23882
上级
fd967883
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
4 deletion
+13
-4
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java
...ion/support/AbstractNamedValueMethodArgumentResolver.java
+3
-2
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolver.java
...on/support/DestinationVariableMethodArgumentResolver.java
+1
-1
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.java
...dler/annotation/support/HeaderMethodArgumentResolver.java
+1
-1
spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java
...annotation/support/HeaderMethodArgumentResolverTests.java
+8
-0
未找到文件。
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java
浏览文件 @
64f2beb9
...
...
@@ -26,6 +26,7 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import
org.springframework.core.MethodParameter
;
import
org.springframework.core.convert.ConversionService
;
import
org.springframework.core.convert.TypeDescriptor
;
import
org.springframework.core.convert.support.DefaultConversionService
;
import
org.springframework.lang.Nullable
;
import
org.springframework.messaging.Message
;
import
org.springframework.messaging.handler.annotation.ValueConstants
;
...
...
@@ -72,10 +73,10 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
* @param beanFactory a bean factory for resolving {@code ${...}}
* placeholders and {@code #{...}} SpEL expressions in default values
*/
protected
AbstractNamedValueMethodArgumentResolver
(
ConversionService
conversionService
,
protected
AbstractNamedValueMethodArgumentResolver
(
@Nullable
ConversionService
conversionService
,
@Nullable
ConfigurableBeanFactory
beanFactory
)
{
this
.
conversionService
=
conversionService
;
this
.
conversionService
=
conversionService
!=
null
?
conversionService
:
DefaultConversionService
.
getSharedInstance
()
;
this
.
configurableBeanFactory
=
beanFactory
;
this
.
expressionContext
=
(
beanFactory
!=
null
?
new
BeanExpressionContext
(
beanFactory
,
null
)
:
null
);
}
...
...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/DestinationVariableMethodArgumentResolver.java
浏览文件 @
64f2beb9
...
...
@@ -41,7 +41,7 @@ public class DestinationVariableMethodArgumentResolver extends AbstractNamedValu
DestinationVariableMethodArgumentResolver
.
class
.
getSimpleName
()
+
".templateVariables"
;
public
DestinationVariableMethodArgumentResolver
(
ConversionService
conversionService
)
{
public
DestinationVariableMethodArgumentResolver
(
@Nullable
ConversionService
conversionService
)
{
super
(
conversionService
,
null
);
}
...
...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.java
浏览文件 @
64f2beb9
...
...
@@ -49,7 +49,7 @@ public class HeaderMethodArgumentResolver extends AbstractNamedValueMethodArgume
public
HeaderMethodArgumentResolver
(
ConversionService
conversionService
,
@Nullable
ConfigurableBeanFactory
beanFactory
)
{
@Nullable
ConversionService
conversionService
,
@Nullable
ConfigurableBeanFactory
beanFactory
)
{
super
(
conversionService
,
beanFactory
);
}
...
...
spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java
浏览文件 @
64f2beb9
...
...
@@ -145,6 +145,14 @@ public class HeaderMethodArgumentResolverTests {
assertThat
(
result
).
isEqualTo
(
Optional
.
of
(
"bar"
));
}
@Test
public
void
resolveOptionalHeaderWithValueFromNullConversionServiceInput
()
throws
Exception
{
GenericApplicationContext
context
=
new
GenericApplicationContext
();
context
.
refresh
();
resolver
=
new
HeaderMethodArgumentResolver
(
null
,
context
.
getBeanFactory
());
resolveOptionalHeaderWithValue
();
}
@Test
public
void
resolveOptionalHeaderAsEmpty
()
throws
Exception
{
Message
<
String
>
message
=
MessageBuilder
.
withPayload
(
"foo"
).
build
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录