You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2015/04/15 18:50:44 UTC
git commit: updated refs/heads/4.5 to b34202a
Repository: cloudstack
Updated Branches:
refs/heads/4.5 fde2615c3 -> b34202a84
CLOUDSTACK-8387 - Close mgmt server peer socket on failure, without relying on autoclose
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b34202a8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b34202a8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b34202a8
Branch: refs/heads/4.5
Commit: b34202a84eedf673c3d6f10eba4fd1b3ca3a8327
Parents: fde2615
Author: MS <m...@turboio.com>
Authored: Wed Apr 15 09:49:48 2015 -0700
Committer: Marcus Sorensen <ma...@apple.com>
Committed: Wed Apr 15 09:50:32 2015 -0700
----------------------------------------------------------------------
.../src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b34202a8/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index d218cf4..ba82938 100755
--- 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 class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust
} 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