apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7563: Fix potential NPE from FingBugs.

Browse Source
This commit is contained in:
Min Chen 2014-10-14 10:35:29 -07:00
parent 771d052381
commit 4b8bfe2627
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -1873,7 +1873,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
try {
pfma = _agentMgr.send(dstHostId, pfmc);
if (pfma == null || !pfma.getResult()) {
String msg = "Unable to prepare for migration due to " + pfma.getDetails();
String details = (pfma != null) ? pfma.getDetails() : "null answer returned";
String msg = "Unable to prepare for migration due to " + details;
pfma = null;
throw new AgentUnavailableException(msg, dstHostId);
}
@ -1909,7 +1910,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
try {
Answer ma = _agentMgr.send(vm.getLastHostId(), mc);
if (ma == null || !ma.getResult()) {
throw new CloudRuntimeException("Unable to migrate due to " + ma.getDetails());
String details = (ma != null) ? ma.getDetails() : "null answer returned";
throw new CloudRuntimeException("Unable to migrate due to " + details);
}
} catch (OperationTimedoutException e) {
if (e.isActive()) {
@ -3263,7 +3265,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
try {
pfma = _agentMgr.send(dstHostId, pfmc);
if (pfma == null || !pfma.getResult()) {
String msg = "Unable to prepare for migration due to " + pfma.getDetails();
String details = (pfma != null) ? pfma.getDetails() : "null answer returned";
String msg = "Unable to prepare for migration due to " + details;
pfma = null;
throw new AgentUnavailableException(msg, dstHostId);
}
@ -3296,8 +3299,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
try {
Answer ma = _agentMgr.send(vm.getLastHostId(), mc);
if (ma == null || !ma.getResult()) {
s_logger.error("Unable to migrate due to " + ma.getDetails());
throw new CloudRuntimeException("Unable to migrate due to " + ma.getDetails());
String details = (ma != null) ? ma.getDetails() : "null answer returned";
String msg = "Unable to migrate due to " + details;
s_logger.error(msg);
throw new CloudRuntimeException(msg);
}
} catch (OperationTimedoutException e) {
if (e.isActive()) {