modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java
| 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 2f962ce204d8f3fb75461c820398a26ee55401df
Merge: db52fd9... ff67750...
Author: John Sanda <jsanda(a)redhat.com>
Date: Thu Aug 26 08:40:54 2010 -0400
Merge branch 'release-3.0.0-patch1' into release-3.0.0
commit ff677500c349d4c6e3908e27fa728251bd55a674
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Aug 25 16:05:31 2010 -0400
[BZ 627391] There was a 2nd method with the query param name wrong
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java
index c1f8d50..b547898 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java
@@ -209,10 +209,10 @@ public class AuthorizationManagerBean implements
AuthorizationManagerLocal {
query.setParameter("parentResourceId", parentResourceId);
query.setParameter("resourceTypeId", resourceTypeId);
- query.setParameter("subject", -1);
+ query.setParameter("subjectId", -1);
long baseCount = (Long) query.getSingleResult();
- query.setParameter("subject", subject);
+ query.setParameter("subjectId", subject.getId());
long subjectCount = (Long) query.getSingleResult();
/*
commit da4c70da6d11ec2a8f1a18dba5bdecd4e31337ee
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Aug 25 13:53:10 2010 -0400
[BZ 627391] Fixing JPAQL query that checks autogroup access
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java
index d675177..c1f8d50 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java
@@ -149,10 +149,10 @@ public class AuthorizationManagerBean implements
AuthorizationManagerLocal {
query.setParameter("parentResourceId", parentResourceId);
query.setParameter("resourceTypeId", resourceTypeId);
- query.setParameter("subject", -1);
+ query.setParameter("subjectId", -1);
long baseCount = (Long) query.getSingleResult();
- query.setParameter("subject", subject);
+ query.setParameter("subjectId", subject.getId());
long subjectCount = (Long) query.getSingleResult();
/*
Show replies by date