From 3683dff493e2493ac3f1ac0b572e8b21361c2134 Mon Sep 17 00:00:00 2001
From: Simon Weller <sweller@ena.com>
Date: Mon, 7 Mar 2016 16:23:35 -0600
Subject: [PATCH] Cloudstack 9285 for 4.7.x

---
 agent/src/com/cloud/agent/Agent.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java
index 994e8224894..2dee5a4e687 100644
--- a/agent/src/com/cloud/agent/Agent.java
+++ b/agent/src/com/cloud/agent/Agent.java
@@ -227,7 +227,7 @@ public class Agent implements HandlerFactory, IAgentControl {
         try {
             _connection.start();
         } catch (final NioConnectionException e) {
-            throw new CloudRuntimeException("Unable to start the connection!", e);
+            s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
         }
         while (!_connection.isStartup()) {
             _shell.getBackoffAlgorithm().waitBeforeRetry();
@@ -235,7 +235,7 @@ public class Agent implements HandlerFactory, IAgentControl {
             try {
                 _connection.start();
             } catch (final NioConnectionException e) {
-                throw new CloudRuntimeException("Unable to start the connection!", e);
+                s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
             }
         }
     }
@@ -412,7 +412,7 @@ public class Agent implements HandlerFactory, IAgentControl {
             try {
                 _connection.start();
             } catch (final NioConnectionException e) {
-                throw new CloudRuntimeException("Unable to start the connection!", e);
+                s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
             }
             _shell.getBackoffAlgorithm().waitBeforeRetry();
         } while (!_connection.isStartup());