Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
e7a53e37
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,发现更多精彩内容 >>
提交
e7a53e37
编写于
7月 02, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid stateful MethodParameter nesting level changes in MVC processing
上级
e5de7d54
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
13 deletion
+10
-13
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
...d/annotation/AbstractMessageConverterMethodProcessor.java
+10
-13
未找到文件。
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
浏览文件 @
e7a53e37
/*
* Copyright 2002-201
5
the original author or authors.
* Copyright 2002-201
6
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.
...
...
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
import
javax.servlet.http.HttpServletResponse
;
import
org.springframework.core.MethodParameter
;
import
org.springframework.core.ResolvableType
;
import
org.springframework.http.HttpEntity
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpOutputMessage
;
...
...
@@ -67,11 +68,6 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
private
static
final
UrlPathHelper
DECODING_URL_PATH_HELPER
=
new
UrlPathHelper
();
static
{
RAW_URL_PATH_HELPER
.
setRemoveSemicolonContent
(
false
);
RAW_URL_PATH_HELPER
.
setUrlDecode
(
false
);
}
/* Extensions associated with the built-in message converters */
private
static
final
Set
<
String
>
WHITELISTED_EXTENSIONS
=
new
HashSet
<
String
>(
Arrays
.
asList
(
"txt"
,
"text"
,
"yml"
,
"properties"
,
"csv"
,
...
...
@@ -81,6 +77,10 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
private
static
final
Set
<
String
>
WHITELISTED_MEDIA_BASE_TYPES
=
new
HashSet
<
String
>(
Arrays
.
asList
(
"audio"
,
"image"
,
"video"
));
static
{
RAW_URL_PATH_HELPER
.
setRemoveSemicolonContent
(
false
);
RAW_URL_PATH_HELPER
.
setUrlDecode
(
false
);
}
private
final
ContentNegotiationManager
contentNegotiationManager
;
...
...
@@ -266,19 +266,16 @@ public abstract class AbstractMessageConverterMethodProcessor extends AbstractMe
}
/**
* Return the generic type of the {@code returnType} (or of the nested type
if it is
*
a
{@link HttpEntity}).
* Return the generic type of the {@code returnType} (or of the nested type
*
if it is an
{@link HttpEntity}).
*/
private
Type
getGenericType
(
MethodParameter
returnType
)
{
Type
type
;
if
(
HttpEntity
.
class
.
isAssignableFrom
(
returnType
.
getParameterType
()))
{
returnType
.
increaseNestingLevel
();
type
=
returnType
.
getNestedGenericParameterType
();
return
ResolvableType
.
forType
(
returnType
.
getGenericParameterType
()).
getGeneric
(
0
).
getType
();
}
else
{
type
=
returnType
.
getGenericParameterType
();
return
returnType
.
getGenericParameterType
();
}
return
type
;
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录