[Hyperic-hq-discuss] hq r3814 - branches/HQ_3_0/src/org/hyperic/hq/authz/server/session

[<cl...@hy...>]

Author: clee
Date: 2007-03-22 08:34:50 -0800 (Thu, 22 Mar 2007)
New Revision: 3814
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3814

Modified:
   branches/HQ_3_0/src/org/hyperic/hq/authz/server/session/ResourceGroupDAO.java
Log:
[HQ-603]
Fix HQL that did not return results for available groups for role [merge from HEAD]


Modified: branches/HQ_3_0/src/org/hyperic/hq/authz/server/session/ResourceGroupDAO.java
===================================================================
--- branches/HQ_3_0/src/org/hyperic/hq/authz/server/session/ResourceGroupDAO.java	2007-03-22 16:29:40 UTC (rev 3813)
+++ branches/HQ_3_0/src/org/hyperic/hq/authz/server/session/ResourceGroupDAO.java	2007-03-22 16:34:50 UTC (rev 3814)
@@ -150,9 +150,7 @@
     {
         return getSession()
             .createQuery("from ResourceGroup g " +
-                         "join fetch g.roles r " +
-                         "where r.id = ? and g.id not in " +
-                         "(select id from r.resourceGroups) and " +
+                         "where ? not in (select id from g.roles) and " +
                          "g.system = false order by g.sortName " +
                          (asc ? "asc" : "desc"))
             .setInteger(0, roleId.intValue())