apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.8 to master

Browse Source 
* 4.8:
  Cloudstack 9285 for 4.7.x
  CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup
  Cloudstack 9285 for 4.7.x
This commit is contained in:
Will Stevens 2016-03-24 11:16:52 -04:00
commit 5251eeddf2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/src/com/cloud/agent/Agent.java
View File

@ -227,7 +227,7 @@ public class Agent implements HandlerFactory, IAgentControl {
try { try {
_connection.start(); _connection.start();
} catch (final NioConnectionException e) { } 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()) { while (!_connection.isStartup()) {
_shell.getBackoffAlgorithm().waitBeforeRetry(); _shell.getBackoffAlgorithm().waitBeforeRetry();
@ -235,7 +235,7 @@ public class Agent implements HandlerFactory, IAgentControl {
try { try {
_connection.start(); _connection.start();
} catch (final NioConnectionException e) { } 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 { try {
_connection.start(); _connection.start();
} catch (final NioConnectionException e) { } 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(); _shell.getBackoffAlgorithm().waitBeforeRetry();
} while (!_connection.isStartup()); } while (!_connection.isStartup());