You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2023/04/03 09:06:11 UTC

[syncope] branch 2_1_X updated: [SYNCOPE-1749] Preserve Dynamic Group Membership Condition order when save from Console

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_1_X by this push:
     new 972ccbaf61 [SYNCOPE-1749] Preserve Dynamic Group Membership Condition order when save from Console
972ccbaf61 is described below

commit 972ccbaf61026e3654c1de8f2072a766dcf2c0e2
Author: Samuel Garofalo <72...@users.noreply.github.com>
AuthorDate: Mon Apr 3 11:04:02 2023 +0200

    [SYNCOPE-1749] Preserve Dynamic Group Membership Condition order when save from Console
---
 .../org/apache/syncope/client/console/panels/search/SearchUtils.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java
index a1bf0facc1..399d5f799c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchUtils.java
@@ -477,10 +477,10 @@ public final class SearchUtils implements Serializable {
 
             if (notTheFirst) {
                 if (clause.getOperator() == SearchClause.Operator.AND) {
-                    condition = builder.and(prevCondition, condition);
+                    condition = builder.and(condition, prevCondition);
                 }
                 if (clause.getOperator() == SearchClause.Operator.OR) {
-                    condition = builder.or(prevCondition, condition);
+                    condition = builder.or(condition, prevCondition);
                 }
             }