[GEOS-7495] WFS Operations in Data Security view don't match WFS 2.0 …

…Capabilities Add missing WFS 2.0.0 operations in Data Security view
geoserver · Aug 13, 2017 · c65f031 · c65f031
1 parent 55e5cdb
commit c65f031
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.../core/src/main/java/org/geoserver/security/web/service/AbstractServiceAccessRulePage.java b/.../core/src/main/java/org/geoserver/security/web/service/AbstractServiceAccessRulePage.java
@@ -134,13 +134,15 @@ class MethodsModel implements IModel<List<String>> {
 
         @Override
         public List<String> getObject() {
-            ArrayList<String> result = new ArrayList<String>();
-            boolean flag = true;
+            List<String> result = new ArrayList<String>();
             for (Service ows : GeoServerExtensions.extensions(Service.class)) {
                 String service = rule.getService();
-                if (ows.getId().equals(service) && !result.contains(ows.getOperations()) && flag) {
-                    flag = false;
-                    result.addAll(ows.getOperations());
+                if (ows.getId().equals(service)) {
+                    for (String operation : ows.getOperations()) {
+                        if (!result.contains(operation)) {
+                            result.add(operation);
+                        }
+                    }
                 }
             }
             Collections.sort(result);