Roy Golan has uploaded a new change for review. Change subject: core: osinfo - extract a validation method ......................................................................
core: osinfo - extract a validation method Change-Id: I80d4a295768ccbed461b20efeaed8f69a06a3d42 Bug-Url: https://bugzilla.redhat.com/996055 Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OsRepositoryImpl.java 1 file changed, 17 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/72/31372/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OsRepositoryImpl.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OsRepositoryImpl.java index 093ede8..f610bac 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OsRepositoryImpl.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/OsRepositoryImpl.java @@ -65,25 +65,29 @@ private void validateTree() { try { - String[] uniqueNames = preferences.node("/os").childrenNames(); - for (String uniqueName : Arrays.asList(uniqueNames)) { - Preferences node = getKeyNode(uniqueName, "derivedFrom", null); - String id = getKeyNode(uniqueName, "id", null).get("value", "0"); - if (node != null) { - String derivedFrom = node.get("value", null); - if (derivedFrom != null && !idToUnameLookup.containsValue(derivedFrom)) { - idToUnameLookup.remove(Integer.valueOf(id)); - preferences.node("/os/" + uniqueName).removeNode(); - log.warn("Illegal parent for os: " + uniqueName); - } - } - } + validateUniqueNames(); } catch (BackingStoreException e) { log.warn("Failed to validate Os Repository due to " + e); throw new RuntimeException("Failed to validate Os Repository due to " + e); } } + private void validateUniqueNames() throws BackingStoreException { + String[] uniqueNames = preferences.node("/os").childrenNames(); + for (String uniqueName : Arrays.asList(uniqueNames)) { + Preferences node = getKeyNode(uniqueName, "derivedFrom", null); + String id = getKeyNode(uniqueName, "id", null).get("value", "0"); + if (node != null) { + String derivedFrom = node.get("value", null); + if (derivedFrom != null && !idToUnameLookup.containsValue(derivedFrom)) { + idToUnameLookup.remove(Integer.valueOf(id)); + preferences.node("/os/" + uniqueName).removeNode(); + log.warn("Illegal parent for os: " + uniqueName); + } + } + } + } + private void buildIdToUnameLookup() { try { String[] uniqueNames = preferences.node("/os").childrenNames(); -- To view, visit http://gerrit.ovirt.org/31372 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I80d4a295768ccbed461b20efeaed8f69a06a3d42 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
