Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove FormatException
......................................................................
core: Remove FormatException
FormatException was introduced in the very first git commit of oVirt,
and has not been used since.
It's safe to assume that it never will, and can safely be removed, along
with any code attempting to catch it.
Change-Id: Ie3e4351aab1f51bbc8ae6b28892ff822d7fa4467
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
D
backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/FormatException.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
2 files changed, 3 insertions(+), 24 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/16812/1
diff --git
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/FormatException.java
b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/FormatException.java
deleted file mode 100644
index 78cc587..0000000
---
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/FormatException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.ovirt.engine.core.compat;
-
-public class FormatException extends RuntimeException {
-
-}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
index 16d299e..c1d8e3b 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
@@ -41,7 +41,6 @@
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.utils.EnumUtils;
-import org.ovirt.engine.core.compat.FormatException;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.RpmVersion;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@@ -64,12 +63,7 @@
public static VmDynamic buildVMDynamicDataFromList(Map<String, Object>
xmlRpcStruct) {
VmDynamic vmdynamic = new VmDynamic();
if (xmlRpcStruct.containsKey(VdsProperties.vm_guid)) {
- try {
- vmdynamic.setId(new Guid((String)
xmlRpcStruct.get(VdsProperties.vm_guid)));
- } catch (FormatException e) {
- log.info("vm id is not in uuid format, ", e);
- vmdynamic.setId(Guid.Empty);
- }
+ vmdynamic.setId(new Guid((String)
xmlRpcStruct.get(VdsProperties.vm_guid)));
}
if (xmlRpcStruct.containsKey(VdsProperties.status)) {
vmdynamic.setStatus(convertToVmStatus((String)
xmlRpcStruct.get(VdsProperties.status)));
@@ -104,12 +98,7 @@
public static void updateVMDynamicData(VmDynamic vm, Map<String, Object>
xmlRpcStruct) {
if (xmlRpcStruct.containsKey(VdsProperties.vm_guid)) {
- try {
- vm.setId(new Guid((String)
xmlRpcStruct.get(VdsProperties.vm_guid)));
- } catch (FormatException e) {
- log.info("vm id is not in uuid format, ", e);
- vm.setId(Guid.Empty);
- }
+ vm.setId(new Guid((String)
xmlRpcStruct.get(VdsProperties.vm_guid)));
}
if (xmlRpcStruct.containsKey(VdsProperties.session)) {
String session = (String) xmlRpcStruct.get(VdsProperties.session);
@@ -259,12 +248,7 @@
public static void updateVMStatisticsData(VmStatistics vm, Map<String,
Object> xmlRpcStruct) {
if (xmlRpcStruct.containsKey(VdsProperties.vm_guid)) {
- try {
- vm.setId(new Guid((String)
xmlRpcStruct.get(VdsProperties.vm_guid)));
- } catch (FormatException e) {
- log.info("vm id is not in uuid format, ", e);
- vm.setId(Guid.Empty);
- }
+ vm.setId(new Guid((String)
xmlRpcStruct.get(VdsProperties.vm_guid)));
}
vm.setelapsed_time(AssignDoubleValue(xmlRpcStruct,
VdsProperties.elapsed_time));
--
To view, visit http://gerrit.ovirt.org/16812
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3e4351aab1f51bbc8ae6b28892ff822d7fa4467
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
