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 2015/11/25 16:41:38 UTC

syncope git commit: [SYNCOPE-119] Always include root realm in isAssignable queries

Repository: syncope
Updated Branches:
  refs/heads/master 59106ffc7 -> 2ec09df55


[SYNCOPE-119] Always include root realm in isAssignable queries


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2ec09df5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2ec09df5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2ec09df5

Branch: refs/heads/master
Commit: 2ec09df55e6036b171d1e398949271e9676706ee
Parents: 59106ff
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Nov 25 16:41:33 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Nov 25 16:41:33 2015 +0100

----------------------------------------------------------------------
 .../apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/2ec09df5/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
index c1f6fe2..2c0139c 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnySearchDAO.java
@@ -648,7 +648,7 @@ public class JPAAnySearchDAO extends AbstractDAO<Any<?>, Long> implements AnySea
         for (Realm current = realm; current.getParent() != null; current = current.getParent()) {
             query.append("realm_id=?").append(setParameter(parameters, current.getKey())).append(" OR ");
         }
-        query.setLength(query.length() - 4);
+        query.append("realm_id=?").append(setParameter(parameters, realmDAO.getRoot().getKey()));
 
         return query.toString();
     }