CLOUDSTACK-8387 - Close mgmt server peer socket on failure, without relying on autoclose

MS · Marcus Sorensen · commit b34202a84eed · 2015-04-15T09:50:32.000-07:00
diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -498,7 +498,7 @@ public SocketChannel connectToPeer(String peerName, SocketChannel prevCh) {
                 } catch (UnknownHostException e) {
                     throw new CloudRuntimeException("Unable to resolve " + ip);
                 }
-                SocketChannel ch1;
+                SocketChannel ch1 = null;
                 try {
                     ch1 = SocketChannel.open(new InetSocketAddress(addr, Port.value()));
                     ch1.configureBlocking(true); // make sure we are working at blocking mode

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ public SocketChannel connectToPeer(String peerName, SocketChannel prevCh) {`
`498`	`498`	`} catch (UnknownHostException e) {`
`499`	`499`	`throw new CloudRuntimeException("Unable to resolve " + ip);`
`500`	`500`	`}`
`501`		`- SocketChannel ch1;`
	`501`	`+ SocketChannel ch1 = null;`
`502`	`502`	`try {`
`503`	`503`	`ch1 = SocketChannel.open(new InetSocketAddress(addr, Port.value()));`
`504`	`504`	`ch1.configureBlocking(true); // make sure we are working at blocking mode`