From 86f867be927ea8deaeb0fdae8842d95eefaf39ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Wed, 24 Aug 2016 00:20:31 +0200 Subject: [PATCH] upd: remove linear search in GroupSelector Change-Id: I8f25674d4c9f953cf049c9ab86210450c7f232fb --- src/org/cacert/gigi/output/GroupSelector.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/org/cacert/gigi/output/GroupSelector.java b/src/org/cacert/gigi/output/GroupSelector.java index 4452a09d..49db7050 100644 --- a/src/org/cacert/gigi/output/GroupSelector.java +++ b/src/org/cacert/gigi/output/GroupSelector.java @@ -26,13 +26,12 @@ public class GroupSelector implements Outputable { public void update(HttpServletRequest r) throws GigiApiException { String vS = r.getParameter(name); - value = null; - for (Group g : Group.values()) { - if (g.getDatabaseName().equals(vS) && mayManage(g)) { - value = g; - } + if (vS == null) { + throw new GigiApiException("No value for group."); } - if (value == null) { + try { + value = Group.getByString(vS); + } catch (IllegalArgumentException e) { throw new GigiApiException("Invalid value for group."); } } -- 2.39.2