Roy Golan has uploaded a new change for review. Change subject: core: WIP libosifno remove umodifiable map usage and make the getter null safe ......................................................................
core: WIP libosifno remove umodifiable map usage and make the getter null safe Change-Id: I7010b4c33cd243845c1a626227e8df42e459e252 Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/services/libosinfo/interface/src/main/java/org/ovirt/engine/core/services/libosinfo/LibosinfoServiceXmlImpl.java 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/9058/1 diff --git a/backend/manager/modules/services/libosinfo/interface/src/main/java/org/ovirt/engine/core/services/libosinfo/LibosinfoServiceXmlImpl.java b/backend/manager/modules/services/libosinfo/interface/src/main/java/org/ovirt/engine/core/services/libosinfo/LibosinfoServiceXmlImpl.java index d3bfd4e..91d6ef5 100644 --- a/backend/manager/modules/services/libosinfo/interface/src/main/java/org/ovirt/engine/core/services/libosinfo/LibosinfoServiceXmlImpl.java +++ b/backend/manager/modules/services/libosinfo/interface/src/main/java/org/ovirt/engine/core/services/libosinfo/LibosinfoServiceXmlImpl.java @@ -1,7 +1,6 @@ package org.ovirt.engine.core.services.libosinfo; import java.io.File; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -114,14 +113,18 @@ @Override public Map<String, Os> getAll() { if (all == null) { - all = Collections.unmodifiableMap(osInfoMap); + all = osInfoMap; } return all; } + /** + * null safe version of the getter - if there's is no match for that short-id, return an empty OS instance. see + * {@link LibosinfoServiceXmlImpl#emptyOs} member. + */ @Override public Os getByShortId(String shortId) { - return osInfoMap.get(shortId); + return osInfoMap.containsKey(shortId) ? osInfoMap.get(shortId) : emptyOs; } @Override -- To view, visit http://gerrit.ovirt.org/9058 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7010b4c33cd243845c1a626227e8df42e459e252 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
