Allon Mureinik has uploaded a new change for review. Change subject: core: Fix DnsSRVLocator possible NPE ......................................................................
core: Fix DnsSRVLocator possible NPE getSRVResult extracted recordList's length before null-checking it, which may have resulted in an NPE. This patch fixes that problem. Change-Id: Id23f34bfb5b358f4c39dd0bd5d3515a5b89414fb Signed-off-by: Allon Mureinik <amure...@redhat.com> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/dns/DnsSRVLocator.java 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/12328/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/dns/DnsSRVLocator.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/dns/DnsSRVLocator.java index fe99f22..4c00764 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/dns/DnsSRVLocator.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/dns/DnsSRVLocator.java @@ -52,6 +52,7 @@ private String address; private boolean used; + @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("valid: ").append(valid).append(" sum: ").append(sum).append("priority: ").append(priority) @@ -223,8 +224,12 @@ } public DnsSRVResult getSRVResult(String domainName, String[] recordsList) { + if (recordsList == null) { + return null; + } + int numOfRecords = recordsList.length; - if (recordsList == null || numOfRecords == 0) { + if (numOfRecords == 0) { return null; } // Read records as retrieved from DNS -- To view, visit http://gerrit.ovirt.org/12328 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id23f34bfb5b358f4c39dd0bd5d3515a5b89414fb 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