Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
a63247b2
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 搜索 >>
提交
a63247b2
编写于
6月 29, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing
上级
dd7ddc08
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
18 deletion
+13
-18
spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java
.../springframework/web/servlet/AsyncHandlerInterceptor.java
+2
-5
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
...od/annotation/ExceptionHandlerExceptionResolverTests.java
+11
-13
未找到文件。
spring-webmvc/src/main/java/org/springframework/web/servlet/AsyncHandlerInterceptor.java
浏览文件 @
a63247b2
/*
* 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.
...
...
@@ -53,7 +53,6 @@ import org.springframework.web.method.HandlerMethod;
*
* @author Rossen Stoyanchev
* @since 3.2
*
* @see org.springframework.web.context.request.async.WebAsyncManager
* @see org.springframework.web.context.request.async.CallableProcessingInterceptor
* @see org.springframework.web.context.request.async.DeferredResultProcessingInterceptor
...
...
@@ -67,15 +66,13 @@ public interface AsyncHandlerInterceptor extends HandlerInterceptor {
* avoid modifying them in ways that would conflict with the concurrent
* execution of the handler. A typical use of this method would be to
* clean up thread-local variables.
*
* @param request the current request
* @param response the current response
* @param handler the handler (or {@link HandlerMethod}) that started async
* execution, for type and/or instance examination
* @throws Exception in case of errors
*/
void
afterConcurrentHandlingStarted
(
HttpServletRequest
request
,
HttpServletResponse
response
,
Object
handler
)
void
afterConcurrentHandlingStarted
(
HttpServletRequest
request
,
HttpServletResponse
response
,
Object
handler
)
throws
Exception
;
}
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java
浏览文件 @
a63247b2
/*
* 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.
...
...
@@ -19,7 +19,7 @@ package org.springframework.web.servlet.mvc.method.annotation;
import
java.io.IOException
;
import
java.io.UnsupportedEncodingException
;
import
java.io.Writer
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
org.junit.Before
;
import
org.junit.BeforeClass
;
...
...
@@ -68,10 +68,10 @@ public class ExceptionHandlerExceptionResolverTests {
@BeforeClass
public
static
void
setupOnce
()
{
ExceptionHandlerExceptionResolver
r
=
new
ExceptionHandlerExceptionResolver
();
r
.
afterPropertiesSet
();
RESOLVER_COUNT
=
r
.
getArgumentResolvers
().
getResolvers
().
size
();
HANDLER_COUNT
=
r
.
getReturnValueHandlers
().
getHandlers
().
size
();
ExceptionHandlerExceptionResolver
r
esolver
=
new
ExceptionHandlerExceptionResolver
();
r
esolver
.
afterPropertiesSet
();
RESOLVER_COUNT
=
r
esolver
.
getArgumentResolvers
().
getResolvers
().
size
();
HANDLER_COUNT
=
r
esolver
.
getReturnValueHandlers
().
getHandlers
().
size
();
}
@Before
...
...
@@ -93,7 +93,7 @@ public class ExceptionHandlerExceptionResolverTests {
@Test
public
void
setCustomArgumentResolvers
()
throws
Exception
{
HandlerMethodArgumentResolver
resolver
=
new
ServletRequestMethodArgumentResolver
();
this
.
resolver
.
setCustomArgumentResolvers
(
Arrays
.
as
List
(
resolver
));
this
.
resolver
.
setCustomArgumentResolvers
(
Collections
.
singleton
List
(
resolver
));
this
.
resolver
.
afterPropertiesSet
();
assertTrue
(
this
.
resolver
.
getArgumentResolvers
().
getResolvers
().
contains
(
resolver
));
...
...
@@ -103,7 +103,7 @@ public class ExceptionHandlerExceptionResolverTests {
@Test
public
void
setArgumentResolvers
()
throws
Exception
{
HandlerMethodArgumentResolver
resolver
=
new
ServletRequestMethodArgumentResolver
();
this
.
resolver
.
setArgumentResolvers
(
Arrays
.
as
List
(
resolver
));
this
.
resolver
.
setArgumentResolvers
(
Collections
.
singleton
List
(
resolver
));
this
.
resolver
.
afterPropertiesSet
();
assertMethodProcessorCount
(
1
,
HANDLER_COUNT
);
...
...
@@ -112,7 +112,7 @@ public class ExceptionHandlerExceptionResolverTests {
@Test
public
void
setCustomReturnValueHandlers
()
{
HandlerMethodReturnValueHandler
handler
=
new
ViewNameMethodReturnValueHandler
();
this
.
resolver
.
setCustomReturnValueHandlers
(
Arrays
.
as
List
(
handler
));
this
.
resolver
.
setCustomReturnValueHandlers
(
Collections
.
singleton
List
(
handler
));
this
.
resolver
.
afterPropertiesSet
();
assertTrue
(
this
.
resolver
.
getReturnValueHandlers
().
getHandlers
().
contains
(
handler
));
...
...
@@ -122,7 +122,7 @@ public class ExceptionHandlerExceptionResolverTests {
@Test
public
void
setReturnValueHandlers
()
{
HandlerMethodReturnValueHandler
handler
=
new
ModelMethodProcessor
();
this
.
resolver
.
setReturnValueHandlers
(
Arrays
.
as
List
(
handler
));
this
.
resolver
.
setReturnValueHandlers
(
Collections
.
singleton
List
(
handler
));
this
.
resolver
.
afterPropertiesSet
();
assertMethodProcessorCount
(
RESOLVER_COUNT
,
1
);
...
...
@@ -217,9 +217,7 @@ public class ExceptionHandlerExceptionResolverTests {
assertEquals
(
"TestExceptionResolver: IllegalStateException"
,
this
.
response
.
getContentAsString
());
}
// SPR-12605
@Test
@Test
// SPR-12605
public
void
resolveExceptionWithHandlerMethodArg
()
throws
Exception
{
AnnotationConfigApplicationContext
cxt
=
new
AnnotationConfigApplicationContext
(
MyConfig
.
class
);
this
.
resolver
.
setApplicationContext
(
cxt
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录