From 55df06779b216ab82a09ae531e91628418c205fa Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@gmail.com>
Date: Tue, 4 Aug 2015 14:12:01 +0200
Subject: [PATCH] CLOUDSTACK-8656: try-with resource on socket channel

---
 .../resource/HypervDirectConnectResource.java       | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
index 0e57df4ca65..17c5708a322 100644
--- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
+++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
@@ -2363,10 +2363,8 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
         // VM patching/rebooting time that may need
         int retry = _retry;
         while (System.currentTimeMillis() - startTick <= _opsTimeout || --retry > 0) {
-            SocketChannel sch = null;
-            try {
-                s_logger.info("Trying to connect to " + ipAddress);
-                sch = SocketChannel.open();
+            s_logger.info("Trying to connect to " + ipAddress);
+            try (SocketChannel sch = SocketChannel.open();) {
                 sch.configureBlocking(true);
                 sch.socket().setSoTimeout(5000);
                 // we need to connect to the control ip address to check the status of the system vm
@@ -2385,13 +2383,6 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
                         s_logger.debug("[ignored] interupted while waiting to retry connecting to vm after exception: "+e.getLocalizedMessage());
                     }
                 }
-            } finally {
-                if (sch != null) {
-                    try {
-                        sch.close();
-                    } catch (IOException e) {
-                    }
-                }
             }
 
             try {