[Engine-patches] Change in ovirt-engine[master]: aaa: filters: cleanup: use profile object directly

[Alon Bar-Lev]

Alon Bar-Lev has uploaded a new change for review.

Change subject: aaa: filters: cleanup: use profile object directly
......................................................................

aaa: filters: cleanup: use profile object directly

Change-Id: I2ba90ceadbcca5e63c85bf6b6f913dd0f5a147b0
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M 
backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java
1 file changed, 6 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/32856/1

diff --git 
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java
 
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java
index d177614..a82c075 100644
--- 
a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java
+++ 
b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java
@@ -106,15 +106,13 @@
         } else {
             findNegotiatingProfiles(httpreq);
             HttpSession session = httpreq.getSession(false);
-            Deque<String> stack = null;
+            Deque<AuthenticationProfile> stack = null;
             if (session != null) {
-                stack = (Deque<String>)session.getAttribute(STACK_ATTR);
+                stack = 
(Deque<AuthenticationProfile>)session.getAttribute(STACK_ATTR);
             }
             if (stack == null) {
-                stack = new ArrayDeque<String>();
-                for (AuthenticationProfile profile : profiles) {
-                    stack.push(profile.getName());
-                }
+                stack = new ArrayDeque<AuthenticationProfile>();
+                stack.addAll(profiles);
             }
             doAuth(httpreq, (HttpServletResponse) rsp, stack);
             if (!stack.isEmpty()) {
@@ -128,13 +126,12 @@
         }
     }
 
-    private void doAuth(HttpServletRequest req, HttpServletResponse rsp, 
Deque<String> stack)
+    private void doAuth(HttpServletRequest req, HttpServletResponse rsp, 
Deque<AuthenticationProfile> stack)
             throws IOException, ServletException {
 
         boolean stop = false;
         while (!stop && !stack.isEmpty()) {
-            AuthenticationProfile profile =
-                    
AuthenticationProfileRepository.getInstance().getProfile(stack.peek());
+            AuthenticationProfile profile = stack.peek();
 
             ExtMap output = profile.getAuthn().invoke(
                 new ExtMap().mput(


-- 
To view, visit http://gerrit.ovirt.org/32856
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ba90ceadbcca5e63c85bf6b6f913dd0f5a147b0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches