Use try-with-resources (#8757)

To ensure the resource is automatically closed

2 files changed, 15 insertions, 15 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java
index 7b837553cb..156caf3437 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java
@@ -45,15 +45,14 @@ public class EditableTableLeak extends TestBase {
         }
 
         public static long getSize(Object object) {
-            ByteCountNullOutputStream os = new ByteCountNullOutputStream();
-            ObjectOutputStream oos;
-            try {
-                oos = new ObjectOutputStream(os);
+            try (ByteCountNullOutputStream os = new ByteCountNullOutputStream()) {
+                ObjectOutputStream oos = new ObjectOutputStream(os);
                 oos.writeObject(object);
+                return os.getBytes();
             } catch (IOException e) {
                 e.printStackTrace();
+                return 0;
             }
-            return os.getBytes();
         }
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
index 0322d76949..c151e57e9c 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -942,16 +942,17 @@ public abstract class AbstractTB3Test extends ParallelTest {
             String hostName = ce.getAddressOfRemoteServer().getHost();
             int port = ce.getAddressOfRemoteServer().getPort();
             HttpHost host = new HttpHost(hostName, port);
-            DefaultHttpClient client = new DefaultHttpClient();
-            URL sessionURL = new URL("http://" + hostName + ":" + port
-                    + "/grid/api/testsession?session=" + d.getSessionId());
-            BasicHttpEntityEnclosingRequest r = new BasicHttpEntityEnclosingRequest(
-                    "POST", sessionURL.toExternalForm());
-            HttpResponse response = client.execute(host, r);
-            JsonObject object = extractObject(response);
-            URL myURL = new URL(object.getString("proxyId"));
-            if ((myURL.getHost() != null) && (myURL.getPort() != -1)) {
-                return myURL.getHost();
+            try (DefaultHttpClient client = new DefaultHttpClient()) {
+                URL sessionURL = new URL("http://" + hostName + ":" + port
+                        + "/grid/api/testsession?session=" + d.getSessionId());
+                BasicHttpEntityEnclosingRequest r = new BasicHttpEntityEnclosingRequest(
+                        "POST", sessionURL.toExternalForm());
+                HttpResponse response = client.execute(host, r);
+                JsonObject object = extractObject(response);
+                URL myURL = new URL(object.getString("proxyId"));
+                if ((myURL.getHost() != null) && (myURL.getPort() != -1)) {
+                    return myURL.getHost();
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();