From c69a2428977aed7df497a479a7e802e9d8d0e922 Mon Sep 17 00:00:00 2001
From: Simon Weller <sweller@ena.com>
Date: Tue, 8 Mar 2016 09:14:07 -0600
Subject: [PATCH] CLOUDSTACK-9285 - Address original on start exception(s) and
 newline cleanup

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

diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java
index 912d3088e1c..7e0a4356aa2 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...");
             }
         }
     }
@@ -413,7 +413,6 @@ public class Agent implements HandlerFactory, IAgentControl {
                 _connection.start();
             } catch (final NioConnectionException e) {
                s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
-
             }
             _shell.getBackoffAlgorithm().waitBeforeRetry();
         } while (!_connection.isStartup());