Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SimpleClientHttpResponse catches any Exception on close

Browse Source 
Issue: SPR-16773
This commit is contained in:
Juergen Hoeller
2018-05-01 23:51:05 +02:00
parent ad0d79a97b
commit 21fad8e205
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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); StreamUtils.drain(this.responseStream);
this.responseStream.close(); this.responseStream.close();
} }
catch (IOException ex) { catch (Exception ex) {
// ignore // ignore
} }
} }

32
spring-web/src/test/java/org/springframework/http/client/SimpleClientHttpResponseTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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.net.HttpURLConnection;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
@@ -30,23 +29,18 @@ import org.springframework.util.StreamUtils;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import static org.mockito.BDDMockito.any;
import static org.mockito.BDDMockito.*; import static org.mockito.BDDMockito.*;
/** /**
* @author Brian Clozel * @author Brian Clozel
* @author Juergen Hoeller
*/ */
public class SimpleClientHttpResponseTests { public class SimpleClientHttpResponseTests {
private SimpleClientHttpResponse response; private final HttpURLConnection connection = mock(HttpURLConnection.class);
private HttpURLConnection connection; private final SimpleClientHttpResponse response = new SimpleClientHttpResponse(this.connection);
@Before
public void setup() throws Exception {
this.connection = mock(HttpURLConnection.class);
this.response = new SimpleClientHttpResponse(this.connection);
}
@Test // SPR-14040 @Test // SPR-14040
@@ -98,8 +92,22 @@ public class SimpleClientHttpResponseTests {
verify(this.connection, never()).disconnect(); 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"));
class TestByteArrayInputStream extends ByteArrayInputStream { InputStream responseStream = this.response.getBody();
responseStream.close();
this.response.close();
verify(is).close();
}
private static class TestByteArrayInputStream extends ByteArrayInputStream {
private boolean closed; private boolean closed;