You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2017/03/31 18:52:47 UTC
svn commit: r1789731 -
/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
Author: ggregory
Date: Fri Mar 31 18:52:46 2017
New Revision: 1789731
URL: http://svn.apache.org/viewvc?rev=1789731&view=rev
Log:
Fix compiler warning: Use try-with-resources.
Modified:
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java?rev=1789731&r1=1789730&r2=1789731&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java Fri Mar 31 18:52:46 2017
@@ -209,12 +209,9 @@ public class TestSSLContextBuilder {
}
});
final int localPort = serverSocket.getLocalPort();
- final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
- try {
+ try (final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket()) {
clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
clientSocket.startHandshake();
- } finally {
- clientSocket.close();
}
}
@@ -266,15 +263,12 @@ public class TestSSLContextBuilder {
});
final int localPort = serverSocket.getLocalPort();
- final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
- try {
+ try (final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket()) {
clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
final InputStream inputStream = clientSocket.getInputStream();
Assert.assertEquals('H', inputStream.read());
Assert.assertEquals('i', inputStream.read());
Assert.assertEquals(-1, inputStream.read());
- } finally {
- clientSocket.close();
}
final Boolean result = future.get(5, TimeUnit.SECONDS);
@@ -341,16 +335,13 @@ public class TestSSLContextBuilder {
});
final int localPort = serverSocket.getLocalPort();
- final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
- try {
+ try (final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket()) {
clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
clientSocket.startHandshake();
final InputStream inputStream = clientSocket.getInputStream();
Assert.assertEquals('H', inputStream.read());
Assert.assertEquals('i', inputStream.read());
Assert.assertEquals(-1, inputStream.read());
- } finally {
- clientSocket.close();
}
final Principal clientPrincipal = future.get(5, TimeUnit.SECONDS);
@@ -393,12 +384,9 @@ public class TestSSLContextBuilder {
});
final int localPort = serverSocket.getLocalPort();
- final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
- try {
+ try (final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket()) {
clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
clientSocket.startHandshake();
- } finally {
- clientSocket.close();
}
}
@@ -440,16 +428,13 @@ public class TestSSLContextBuilder {
}
});
final int localPort = serverSocket.getLocalPort();
- final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
- try {
+ try (final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket()) {
clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
clientSocket.startHandshake();
final InputStream inputStream = clientSocket.getInputStream();
Assert.assertEquals('H', inputStream.read());
Assert.assertEquals('i', inputStream.read());
Assert.assertEquals(-1, inputStream.read());
- } finally {
- clientSocket.close();
}
final Principal clientPrincipal = future.get(5, TimeUnit.SECONDS);
@@ -506,16 +491,13 @@ public class TestSSLContextBuilder {
}
});
final int localPort = serverSocket.getLocalPort();
- final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
- try {
+ try (final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket()) {
clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
clientSocket.startHandshake();
final InputStream inputStream = clientSocket.getInputStream();
Assert.assertEquals('H', inputStream.read());
Assert.assertEquals('i', inputStream.read());
Assert.assertEquals(-1, inputStream.read());
- } finally {
- clientSocket.close();
}
final Principal clientPrincipal = future.get(5, TimeUnit.SECONDS);
@@ -563,15 +545,12 @@ public class TestSSLContextBuilder {
});
final int localPort = serverSocket.getLocalPort();
- final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
- try {
+ try (final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket()) {
final Set<String> supportedClientProtocols = new LinkedHashSet<>(Arrays.asList(clientSocket.getSupportedProtocols()));
Assert.assertTrue(supportedClientProtocols.contains("SSLv3"));
clientSocket.setEnabledProtocols(new String[] {"SSLv3"} );
clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
clientSocket.startHandshake();
- } finally {
- clientSocket.close();
}
}
@@ -621,16 +600,13 @@ public class TestSSLContextBuilder {
});
final int localPort = serverSocket.getLocalPort();
- final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket();
- try {
+ try (final SSLSocket clientSocket = (SSLSocket) clientSslContext.getSocketFactory().createSocket()) {
final Set<String> supportedClientProtocols = new LinkedHashSet<>(
Arrays.asList(clientSocket.getSupportedProtocols()));
Assert.assertTrue(supportedClientProtocols.contains("TLSv1"));
clientSocket.setEnabledProtocols(new String[] { "TLSv1" });
clientSocket.connect(new InetSocketAddress("localhost", localPort), 5000);
clientSocket.startHandshake();
- } finally {
- clientSocket.close();
}
}