Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sesemomo
spring-framework
提交
21fad8e2
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,发现更多精彩内容 >>
提交
21fad8e2
编写于
5月 01, 2018
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SimpleClientHttpResponse catches any Exception on close
Issue: SPR-16773
上级
ad0d79a9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
14 deletion
+22
-14
spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java
...springframework/http/client/SimpleClientHttpResponse.java
+2
-2
spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java
...gframework/http/client/SimpleClientHttpResponseTests.java
+20
-12
未找到文件。
spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java
浏览文件 @
21fad8e2
/*
* Copyright 2002-201
7
the original author or authors.
* Copyright 2002-201
8
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.
...
...
@@ -96,7 +96,7 @@ final class SimpleClientHttpResponse extends AbstractClientHttpResponse {
StreamUtils
.
drain
(
this
.
responseStream
);
this
.
responseStream
.
close
();
}
catch
(
IO
Exception
ex
)
{
catch
(
Exception
ex
)
{
// ignore
}
}
...
...
spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java
浏览文件 @
21fad8e2
/*
* Copyright 2002-201
7
the original author or authors.
* Copyright 2002-201
8
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.
...
...
@@ -22,7 +22,6 @@ import java.io.InputStream;
import
java.net.HttpURLConnection
;
import
java.nio.charset.StandardCharsets
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.springframework.util.StreamUtils
;
...
...
@@ -30,23 +29,18 @@ import org.springframework.util.StreamUtils;
import
static
org
.
hamcrest
.
MatcherAssert
.
assertThat
;
import
static
org
.
hamcrest
.
Matchers
.*;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
BDDMockito
.
any
;
import
static
org
.
mockito
.
BDDMockito
.*;
/**
* @author Brian Clozel
* @author Juergen Hoeller
*/
public
class
SimpleClientHttpResponseTests
{
private
SimpleClientHttpResponse
response
;
private
final
HttpURLConnection
connection
=
mock
(
HttpURLConnection
.
class
)
;
private
HttpURLConnection
connection
;
@Before
public
void
setup
()
throws
Exception
{
this
.
connection
=
mock
(
HttpURLConnection
.
class
);
this
.
response
=
new
SimpleClientHttpResponse
(
this
.
connection
);
}
private
final
SimpleClientHttpResponse
response
=
new
SimpleClientHttpResponse
(
this
.
connection
);
@Test
// SPR-14040
...
...
@@ -98,8 +92,22 @@ public class SimpleClientHttpResponseTests {
verify
(
this
.
connection
,
never
()).
disconnect
();
}
@Test
// SPR-16773
public
void
shouldNotDrainWhenErrorStreamClosed
()
throws
Exception
{
InputStream
is
=
mock
(
InputStream
.
class
);
given
(
this
.
connection
.
getErrorStream
()).
willReturn
(
is
);
doNothing
().
when
(
is
).
close
();
given
(
is
.
read
(
any
())).
willThrow
(
new
NullPointerException
(
"from HttpURLConnection#ErrorStream"
));
InputStream
responseStream
=
this
.
response
.
getBody
();
responseStream
.
close
();
this
.
response
.
close
();
verify
(
is
).
close
();
}
class
TestByteArrayInputStream
extends
ByteArrayInputStream
{
private
static
class
TestByteArrayInputStream
extends
ByteArrayInputStream
{
private
boolean
closed
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录