CLOUDSTACK-10122: Unrelated error message (#2302)

nvazquez · yadvr · commit 1315c947c095 · 2017-11-03T20:33:33.000+05:30
Simply remove unrelated text from error message
diff --git 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);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1409,21 +1409,16 @@ public void prepare(VirtualMachineProfile vm, DeployDestination dest) throws Sto`
`1409`	`1409`	`if (value != null && value) {`
`1410`	`1410`	`cloneType = UserVmCloneType.full;`
`1411`	`1411`	`}`
`1412`		`- try {`
`1413`		`- UserVmCloneSettingVO cloneSettingVO = _vmCloneSettingDao.findByVmId(vm.getId());`
`1414`		`- if (cloneSettingVO != null){`
`1415`		`- if (! cloneSettingVO.getCloneType().equals(cloneType.toString())){`
`1416`		`- cloneSettingVO.setCloneType(cloneType.toString());`
`1417`		`- _vmCloneSettingDao.update(cloneSettingVO.getVmId(), cloneSettingVO);`
`1418`		`- }`
`1419`		`- }`
`1420`		`- else {`
`1421`		`- UserVmCloneSettingVO vmCloneSettingVO = new UserVmCloneSettingVO(vm.getId(), cloneType.toString());`
`1422`		`- _vmCloneSettingDao.persist(vmCloneSettingVO);`
	`1412`	`+ UserVmCloneSettingVO cloneSettingVO = _vmCloneSettingDao.findByVmId(vm.getId());`
	`1413`	`+ if (cloneSettingVO != null){`
	`1414`	`+ if (! cloneSettingVO.getCloneType().equals(cloneType.toString())){`
	`1415`	`+ cloneSettingVO.setCloneType(cloneType.toString());`
	`1416`	`+ _vmCloneSettingDao.update(cloneSettingVO.getVmId(), cloneSettingVO);`
`1423`	`1417`	`}`
`1424`	`1418`	`}`
`1425`		`- catch (Throwable e){`
`1426`		`- s_logger.debug("[NSX_PLUGIN_LOG] ERROR: " + e.getMessage());`
	`1419`	`+ else {`
	`1420`	`+ UserVmCloneSettingVO vmCloneSettingVO = new UserVmCloneSettingVO(vm.getId(), cloneType.toString());`
	`1421`	`+ _vmCloneSettingDao.persist(vmCloneSettingVO);`
`1427`	`1422`	`}`
`1428`	`1423`	`}`
`1429`	`1424`