Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
2e494419
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 搜索 >>
提交
2e494419
编写于
11月 06, 2019
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix condition in ServletInvocableHandlerMethod
Closes gh-23775
上级
38a1caef
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
2 deletion
+19
-2
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
.../mvc/method/annotation/ServletInvocableHandlerMethod.java
+1
-1
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
...method/annotation/ServletInvocableHandlerMethodTests.java
+18
-1
未找到文件。
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
浏览文件 @
2e494419
...
...
@@ -165,7 +165,7 @@ public class ServletInvocableHandlerMethod extends InvocableHandlerMethod {
}
private
void
disableContentCachingIfNecessary
(
ServletWebRequest
webRequest
)
{
if
(
!
isRequestNotModified
(
webRequest
))
{
if
(
isRequestNotModified
(
webRequest
))
{
HttpServletResponse
response
=
webRequest
.
getNativeResponse
(
HttpServletResponse
.
class
);
Assert
.
notNull
(
response
,
"Expected HttpServletResponse"
);
if
(
StringUtils
.
hasText
(
response
.
getHeader
(
"ETag"
)))
{
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
浏览文件 @
2e494419
/*
* Copyright 2002-201
7
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.
...
...
@@ -31,6 +31,7 @@ import reactor.core.publisher.Flux;
import
org.springframework.core.MethodParameter
;
import
org.springframework.core.ResolvableType
;
import
org.springframework.core.annotation.AliasFor
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.http.converter.HttpMessageConverter
;
...
...
@@ -46,6 +47,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
import
org.springframework.web.context.request.NativeWebRequest
;
import
org.springframework.web.context.request.ServletWebRequest
;
import
org.springframework.web.context.request.async.DeferredResult
;
import
org.springframework.web.filter.ShallowEtagHeaderFilter
;
import
org.springframework.web.method.annotation.RequestParamMethodArgumentResolver
;
import
org.springframework.web.method.support.HandlerMethodArgumentResolverComposite
;
import
org.springframework.web.method.support.HandlerMethodReturnValueHandler
;
...
...
@@ -139,6 +141,21 @@ public class ServletInvocableHandlerMethodTests {
this
.
mavContainer
.
isRequestHandled
());
}
@Test
// gh-23775
public
void
invokeAndHandle_VoidNotModifiedWithEtag
()
throws
Exception
{
String
etag
=
"\"deadb33f8badf00d\""
;
this
.
request
.
addHeader
(
HttpHeaders
.
IF_NONE_MATCH
,
etag
);
this
.
webRequest
.
checkNotModified
(
etag
);
ServletInvocableHandlerMethod
handlerMethod
=
getHandlerMethod
(
new
Handler
(),
"notModified"
);
handlerMethod
.
invokeAndHandle
(
this
.
webRequest
,
this
.
mavContainer
);
assertTrue
(
"Null return value + 'not modified' request should result in 'request handled'"
,
this
.
mavContainer
.
isRequestHandled
());
assertEquals
(
true
,
this
.
request
.
getAttribute
(
ShallowEtagHeaderFilter
.
class
.
getName
()
+
".STREAMING"
));
}
@Test
// SPR-9159
public
void
invokeAndHandle_NotVoidWithResponseStatusAndReason
()
throws
Exception
{
ServletInvocableHandlerMethod
handlerMethod
=
getHandlerMethod
(
new
Handler
(),
"responseStatusWithReason"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录