cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: updated refs/heads/master to 42a8253
Date Wed, 15 Apr 2015 16:50:09 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master aab0bfc80 -> 42a825399


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/42a82539
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/42a82539
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/42a82539

Branch: refs/heads/master
Commit: 42a82539932abde45384b49226a8e32de44cfff1
Parents: aab0bfc
Author: MS <m@turboio.com>
Authored: Wed Apr 15 09:49:48 2015 -0700
Committer: Marcus Sorensen <marcus_sorensen@apple.com>
Committed: Wed Apr 15 09:49:48 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/42a82539/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 100644
--- 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


Mime
View raw message