DaanHoogland closed pull request #2756: fix provisionCertificate api returns
NPE when 'reconnect' parameter is true
URL: https://github.com/apache/cloudstack/pull/2756
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
index 38822cba16b..d0cced3007a 100644
---
a/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
+++
b/engine/orchestration/src/main/java/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -367,10 +367,10 @@ public void reconnect(final long hostId) throws
CloudRuntimeException, AgentUnav
Boolean result = propagateAgentEvent(hostId, Event.ShutdownRequested);
if (result == null) {
super.reconnect(hostId);
-
+ return;
}
if (!result) {
- throw new CloudRuntimeException("Failed to propagating agent
change request event:" + Event.ShutdownRequested + " to host:" + hostId);
+ throw new CloudRuntimeException("Failed to propagate agent
change request event:" + Event.ShutdownRequested + " to host:" + hostId);
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
