Moti Asayag has uploaded a new change for review. Change subject: Revert "core: fix NPE is Challenger" ......................................................................
Revert "core: fix NPE is Challenger" This reverts commit 01ee24bc2010252f71d47dc950835fccbeed0110. Reverted due to failed unit-tests. Signed-off-by: Moti Asayag <[email protected]> Change-Id: I2130b5f5af1d8d3167aa5b5246c58a4bc0773808 --- M backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/Challenger.java 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/7876/1 diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/Challenger.java b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/Challenger.java index 7f50d49..1f9df3f 100644 --- a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/Challenger.java +++ b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/Challenger.java @@ -86,12 +86,10 @@ HttpSession httpSession = getCurrentSession(true); // If the session isn't a new session then we validate it, otherwise we authenticate - if (validator != null && httpSession != null) { - if (!httpSession.isNew()) { - successful = executeSessionValidation(httpSession, preferPersistentAuth); - } else { - successful = executeBasicAuthentication(headers, httpSession, preferPersistentAuth); - } + if (validator != null && httpSession != null && !httpSession.isNew()) { + successful = executeSessionValidation(httpSession, preferPersistentAuth); + } else { + successful = executeBasicAuthentication(headers, httpSession, preferPersistentAuth); } if (!successful) { -- To view, visit http://gerrit.ovirt.org/7876 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2130b5f5af1d8d3167aa5b5246c58a4bc0773808 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
