rhtyd closed pull request #2302: CLOUDSTACK-10122: Unrelated error message
URL: https://github.com/apache/cloudstack/pull/2302
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/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 66928baa765..7669b3b98a9 100644
---
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -1409,21 +1409,16 @@ public void prepare(VirtualMachineProfile vm,
DeployDestination dest) throws Sto
if (value != null && value) {
cloneType = UserVmCloneType.full;
}
- try {
- UserVmCloneSettingVO cloneSettingVO =
_vmCloneSettingDao.findByVmId(vm.getId());
- if (cloneSettingVO != null){
- if (!
cloneSettingVO.getCloneType().equals(cloneType.toString())){
- cloneSettingVO.setCloneType(cloneType.toString());
-
_vmCloneSettingDao.update(cloneSettingVO.getVmId(), cloneSettingVO);
- }
- }
- else {
- UserVmCloneSettingVO vmCloneSettingVO = new
UserVmCloneSettingVO(vm.getId(), cloneType.toString());
- _vmCloneSettingDao.persist(vmCloneSettingVO);
+ UserVmCloneSettingVO cloneSettingVO =
_vmCloneSettingDao.findByVmId(vm.getId());
+ if (cloneSettingVO != null){
+ if (!
cloneSettingVO.getCloneType().equals(cloneType.toString())){
+ cloneSettingVO.setCloneType(cloneType.toString());
+ _vmCloneSettingDao.update(cloneSettingVO.getVmId(),
cloneSettingVO);
}
}
- catch (Throwable e){
- s_logger.debug("[NSX_PLUGIN_LOG] ERROR: " +
e.getMessage());
+ else {
+ UserVmCloneSettingVO vmCloneSettingVO = new
UserVmCloneSettingVO(vm.getId(), cloneType.toString());
+ _vmCloneSettingDao.persist(vmCloneSettingVO);
}
}
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
